Fixed quit.

This commit is contained in:
Phil Jackson 2010-08-31 23:41:03 +01:00
parent fc2fe2b56e
commit c0324a5a09

View file

@ -187,7 +187,7 @@ put it in magit-key-mode-key-maps for fast lookup."
;; all maps should 'quit' with C-g ;; all maps should 'quit' with C-g
(define-key map (kbd "C-g") (lambda () (define-key map (kbd "C-g") (lambda ()
(interactive) (interactive)
(magit-key-mode-command 'identity))) (magit-key-mode-command nil)))
(when actions (when actions
(dolist (k actions) (dolist (k actions)
(define-key map (car k) `(lambda () (define-key map (car k) `(lambda ()
@ -237,7 +237,8 @@ put it in magit-key-mode-key-maps for fast lookup."
magit-key-mode-current-args) magit-key-mode-current-args)
(let ((magit-custom-options (append args magit-key-mode-current-options))) (let ((magit-custom-options (append args magit-key-mode-current-options)))
(set-window-configuration magit-log-mode-window-conf) (set-window-configuration magit-log-mode-window-conf)
(funcall func) (when func
(funcall func))
(magit-key-mode-kill-buffer)))) (magit-key-mode-kill-buffer))))
(defvar magit-key-mode-current-args nil (defvar magit-key-mode-current-args nil