diff --git a/magit-key-mode.el b/magit-key-mode.el index 2a54c844..8f436cc9 100644 --- a/magit-key-mode.el +++ b/magit-key-mode.el @@ -20,10 +20,10 @@ '((logging (man-page "git-log") (actions - ("l" "Short" magit-log) + ("l" "Short" magit-display-log) ("L" "Long" magit-log-long) - ("r l" "Ranged short" magit-log-ranged) - ("r L" "Ranged long" magit-log-long-ranged) + ("rl" "Ranged short" magit-display-log-ranged) + ("rL" "Ranged long" magit-log-long-ranged) ("h" "Reflog" magit-reflog) ("H" "Reflog on head" magit-reflog-head)) (switches diff --git a/magit.el b/magit.el index 25803e20..e1faa7f6 100644 --- a/magit.el +++ b/magit.el @@ -3793,10 +3793,15 @@ With a non numeric prefix ARG, show all entries" (defvar magit-log-grep-buffer-name "*magit-grep-log*" "Buffer name for display of log grep results.") +(magit-define-command display-log-ranged () + (interactive) + (magit-display-log t)) + (magit-define-command display-log (ask-for-range &rest extra-args) + (interactive) (let* ((log-range (if ask-for-range - (magit-read-rev-range "Log" "HEAD") - "HEAD")) + (magit-read-rev-range "Log" "HEAD") + "HEAD")) (topdir (magit-get-top-dir default-directory)) (args (nconc (list (magit-rev-range-to-git log-range)) extra-args))) @@ -3805,12 +3810,7 @@ With a non numeric prefix ARG, show all entries" "--pretty=oneline" args) (magit-log-mode t))) -(defun magit-log (&optional arg) - "View and act upon the output of git log." - (interactive "P") - (apply 'magit-display-log arg magit-custom-options)) - -(magit-define-command magit-log-long-ranged () +(magit-define-command log-long-ranged () (interactive) (magit-log-long t))