Mercurial > emacs
changeset 108110:21b1df34bc55
tool-bar.el: Revert unintended checkin in rev 100010.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 25 Apr 2010 09:23:01 +0200 |
| parents | 473b75d8b120 |
| children | cfcf7c495ca4 2d8a4d786871 |
| files | lisp/ChangeLog lisp/tool-bar.el |
| diffstat | 2 files changed, 20 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Apr 24 12:50:03 2010 -0700 +++ b/lisp/ChangeLog Sun Apr 25 09:23:01 2010 +0200 @@ -1,3 +1,8 @@ +2010-04-25 Jan Djärv <jan.h.d@swipnet.se> + + * tool-bar.el (tool-bar-local-item-from-menu): Revert unintended + checkin in rev 100010. + 2010-04-24 Glenn Morris <rgm@gnu.org> * emacs-lisp/authors.el (authors-obsolete-files-regexps):
--- a/lisp/tool-bar.el Sat Apr 24 12:50:03 2010 -0700 +++ b/lisp/tool-bar.el Sun Apr 25 09:23:01 2010 +0200 @@ -243,24 +243,24 @@ ;; Last element in the bound key sequence: (kk (aref k (1- (length k))))) (if (and (keymapp m) - (symbolp kk)) ;FIXME: Why? --Stef + (symbolp kk)) (setq submap m key kk))))) - (when submap - (let ((defn nil)) - ;; Here, we're essentially doing a "lookup-key without get_keyelt". - (map-keymap (lambda (k b) (if (eq k key) (setq defn b))) - submap) + (when (and (symbolp submap) (boundp submap)) + (setq submap (eval submap))) + (let ((defn (assq key (cdr submap)))) + (if (eq (cadr defn) 'menu-item) + (define-key-after in-map (vector key) + (append (cdr defn) (list :image image-exp) props)) + (setq defn (cdr defn)) (define-key-after in-map (vector key) - (if (eq (car defn) 'menu-item) - (append (cdr defn) (list :image image-exp) 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-exp) 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-exp) props))))))) ;;; Set up some global items. Additions/deletions up for grabs.