gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not require the -option suffix for menu items

Browse source
This commit is contained in:
oscar 2010-05-16 18:43:33 +02:00
parent 46592b4dcd
commit 2f9c9b99fb
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
magit.el
View file

@ -1402,8 +1402,8 @@ FUNC should leave point at the end of the modified region"
'("Log" ?s "Search for regexp" magit-log-grep)
'("Log" ?h "Reflog" magit-reflog)
'("Log" ?H "Reflog head" magit-reflog-head)
'("Log-option" ?a "All branches" "--all" magit-true)
'("Log-option" ?R "Restrict to path" "--relative=" read-directory-name)
'("Log" ?a "All branches" "--all" magit-true)
'("Log" ?R "Restrict to path" "--relative=" read-directory-name)
))))
(defvar magit-mode-map
@ -3538,15 +3538,16 @@ With a non numeric prefix ARG, show all entries"
(magit-submenu "Log" arg))
(defun magit-get-menu-options (group)
(let ((option-key (concat group "-option"))
(menu-items '()))
(let ((menu-items '()))
(dolist (item magit-menu)
(cond
((string= (car item) option-key)
;; We append an extra cell to the item for storing the option's value:
(setq menu-items (append menu-items (list (append item (list nil))))))
((string= (car item) group)
(setq menu-items (append menu-items (list item))))))
(when (string= (car item) group)
(cond
((stringp (nth 3 item)) ;; It's an option
;; We append an extra cell to the item for storing the option's value:
(setq menu-items (append menu-items (list (append item (list nil))))))
((functionp (nth 3 item)) ;; It's a command
(setq menu-items (append menu-items (list item))))
(t (error "Unrecognised item type in `magit-menu': %S." item)))))
menu-items))
(defun magit-build-menu (group menu-items)