1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

(tool-bar-add-item-from-menu): Handle

old-style menu definitions.
This commit is contained in:
Gerd Moellmann 2001-08-06 10:41:52 +00:00
parent 6228c05b99
commit 98a8938cdd
3 changed files with 21 additions and 6 deletions

View file

@ -1,6 +1,6 @@
;;; tool-bar.el --- setting up the tool bar
;;
;; Copyright (C) 2000 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
;;
;; Author: Dave Love <fx@gnu.org>
;; Keywords: mouse frames
@ -164,8 +164,14 @@ function."
(setq submap (eval submap)))
(unless (image-mask-p image)
(setq image (append image '(:mask heuristic))))
(define-key-after tool-bar-map (vector key)
(append (cdr (assq key (cdr submap))) (list :image image) props)))))
(let ((defn (assq key (cdr submap))))
(if (eq (cadr defn) 'menu-item)
(define-key-after tool-bar-map (vector key)
(append (cdr defn) (list :image image) props))
(setq defn (cdr defn))
(define-key-after tool-bar-map (vector key)
(append `(menu-item ,(car defn) ,(cddr defn))
(list :image image) props)))))))
;;; Set up some global items. Additions/deletions up for grabs.