diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2008-07-09 12:23:01 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2008-07-09 12:23:01 +0000 |
| commit | f972a399c24c65bd12556dfa728453c8e8ec4eed (patch) | |
| tree | b2523b28c7c8c914de9b74d0814bcc04e435dcdf /generic/proof-toolbar.el | |
| parent | 767cb771c5f04dc4c3648d7cb12d9e59f134fae3 (diff) | |
Fix for GNU Emacs 23 tool bar, set image-load-path persistently. NB: may cause breakage on older Emacs (tested on 22.2).
Diffstat (limited to 'generic/proof-toolbar.el')
| -rw-r--r-- | generic/proof-toolbar.el | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/generic/proof-toolbar.el b/generic/proof-toolbar.el index aca064fe..f3f389ac 100644 --- a/generic/proof-toolbar.el +++ b/generic/proof-toolbar.el @@ -211,18 +211,17 @@ to the default toolbar." ;; For XEmacs, we evaluate the specifier. (setq proof-toolbar (mapcar 'eval proof-toolbar-button-list)) - ;; On GNU emacs, we need to make a new "key"map, - ;; and set a local copy of tool-bar-map to it. + ;; On GNU Emacs, we need to make a new "key"map. (setq proof-toolbar (make-sparse-keymap)) - (let ((tool-bar-map proof-toolbar) - (load-path (list proof-images-directory))) ; for finding images - (dolist (but proof-toolbar-button-list) - (apply - 'tool-bar-add-item - (eval (nth 0 but)) ; image filename - (nth 1 but) ; function symbol - (nth 2 but) ; dummy key - (nthcdr 3 but))))) ; remaining properties + (add-to-list 'image-load-path proof-images-directory) ; rude? + (dolist (but proof-toolbar-button-list) + (apply + 'tool-bar-local-item + (eval (nth 0 but)) ; image filename + (nth 1 but) ; function symbol + (nth 2 but) ; dummy key + proof-toolbar + (nthcdr 3 but)))) ; remaining properties ;; Finished )) |