1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00

(tool-bar-local-item-from-menu): Handle both cases: when the menu item

has cached info and when it doesn't.
This commit is contained in:
Richard M. Stallman 2002-05-05 03:06:58 +00:00
parent cd56bfef62
commit 2fab432898
2 changed files with 23 additions and 2 deletions

View File

@ -1,3 +1,19 @@
2002-05-04 Richard M. Stallman <rms@gnu.org>
* toolbar/tool-bar.el (tool-bar-local-item-from-menu):
Handle both cases: when the menu item has cached info
and when it doesn't.
* filesets.el (filesets-browse-dir-function): Renamed from ...-fn.
(filesets-open-file-function, filesets-save-buffer-function): Likewise.
(filesets-tree-max-level): Doc fix.
(filesets-commands, filesets-external-viewers)
(filesets-ingroup-patterns): Mark as risky.
(filesets-cache-hostname-flag): Doc fix.
(filesets-menu-cache-file): Doc fix. Mark as risky.
(filesets-menu-before, filesets-menu-path, filesets-menu-in-menu):
Don't defcustom them if running in Emacs.
2002-05-04 Thomas Link <t.link@gmx.at>
* filesets.el (filesets-ingroup-collect-files):

View File

@ -208,8 +208,13 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
(append (cdr defn) (list :image image) props))
(setq defn (cdr defn))
(define-key-after in-map (vector key)
(append `(menu-item ,(car defn) ,(cdr defn))
(list :image image) props)))))))
(let ((rest (cdr defn)))
;; If the rest of the definition starts
;; with a list of menu cache info, get rid of that.
(if (and (consp rest) (consp (car rest)))
(setq rest (cdr rest)))
(append `(menu-item ,(car defn) ,rest)
(list :image image) props))))))))
;;; Set up some global items. Additions/deletions up for grabs.