Merge: v1.7.1

alphapapa · Feb 13, 2024 · 1e9acc0 · 1e9acc0
2 parents debb77b + a2396aa
commit 1e9acc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/README.org b/README.org
@@ -154,6 +154,12 @@ Helm and Ivy are also supported.  Note that the =helm= and =ivy= packages are no
 + Option ~magit-todos-keyword-suffix~ defaults to allowing suffixes to be enclosed by parentheses or brackets (rather than just parentheses).
 + Minor improvements to warnings about files containing very long lines: display as messages instead of warnings, and signal errors from outside the process sentinel.
 
+** 1.7.1
+
+*Fixes*
++ Don't run branch scanner on a branch without a merge base relative to the main branch.  ([[https://github.com/alphapapa/magit-todos/issues/153][#153]].  Thanks to [[https://github.com/Shinmera][Yukari Hafner]] for reporting.)
++ Keymap parent in status buffer's to-do section.  ([[https://github.com/alphapapa/magit-todos/issues/143][#143]].  Thanks to [[https://github.com/mpaulmier][Matthias Paulmier]].)
+
 ** 1.7
 
 *Changed*

diff --git a/magit-todos.el b/magit-todos.el
@@ -119,8 +119,7 @@ Used to avoid running multiple simultaneous scans for a
 
 (defvar magit-todos-section-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "jT" #'magit-todos-jump-to-todos)
-    (define-key map "jl" #'magit-todos-list)
+    (set-keymap-parent map magit-status-mode-map)
     (define-key map "b" #'magit-todos-branch-list-toggle)
     (define-key map "B" #'magit-todos-branch-list-set-commit)
     (define-key map [remap magit-visit-thing] #'magit-todos-list)
@@ -1311,17 +1310,15 @@ When SYNC is non-nil, match items are returned."
                                                  (optional (group-n 6 (regexp ,magit-todos-keyword-suffix)))
                                                  (optional (1+ blank))
                                                  (optional (group-n 5 (1+ not-newline)))))))))
-                (command (-flatten
-                          (-non-nil
-                           (list (when magit-todos-nice
-                                   (list "nice" "-n5"))
-                                 ,command)))))
+                (command (-flatten (-non-nil ,command))))
            ;; Convert any numbers in command to strings (e.g. depth).
            (cl-loop for elt in-ref command
                     when (numberp elt)
                     do (setf elt (number-to-string elt)))
            ;; Run command.
            (when command
+             (when magit-todos-nice
+               (setf command (append (list "nice" "-n5") command)))
              (if sync
                  ;; Synchronous: return matching items.
                  (with-temp-buffer