[emacs] Restore toggle behaviour of ledger-occur command, for menu users

This commit is contained in:
Steve Purcell 2014-12-10 16:28:53 +00:00
parent 78a2bb0823
commit b960eec520

View file

@ -59,12 +59,6 @@
(ledger-occur-refresh) (ledger-occur-refresh)
(ledger-occur-remove-overlays))) (ledger-occur-remove-overlays)))
(defun ledger-occur-quit ()
"Disable `ledger-occur-mode', turning off narrowing."
(interactive)
(ledger-occur-mode -1))
(define-key ledger-occur-mode-map (kbd "C-c C-f") 'ledger-occur-quit)
(define-key ledger-occur-mode-map (kbd "C-c C-g") 'ledger-occur-refresh) (define-key ledger-occur-mode-map (kbd "C-c C-g") 'ledger-occur-refresh)
(defun ledger-occur-refresh () (defun ledger-occur-refresh ()
@ -84,10 +78,14 @@ This command hides all xact in the current buffer except those
matching REGEX. If REGEX is nil or empty, turn off any narrowing matching REGEX. If REGEX is nil or empty, turn off any narrowing
currently active." currently active."
(interactive (interactive
(list (read-regexp "Regexp" (ledger-occur-prompt) 'ledger-occur-history))) (if ledger-occur-mode
(list nil)
(list (read-regexp "Regexp" (ledger-occur-prompt) 'ledger-occur-history))))
(if (or (null regex) (if (or (null regex)
(zerop (length regex))) ; empty regex, or already have narrowed, clear narrowing (zerop (length regex))) ; empty regex, or already have narrowed, clear narrowing
(ledger-occur-mode -1) (progn
(message "Showing all transactions")
(ledger-occur-mode -1))
(setq ledger-occur-current-regex regex) (setq ledger-occur-current-regex regex)
(ledger-occur-mode 1))) (ledger-occur-mode 1)))