diff options
| author | David Aspinall | 2004-03-01 11:37:04 +0000 |
|---|---|---|
| committer | David Aspinall | 2004-03-01 11:37:04 +0000 |
| commit | 9d9784134aa243789a018f309f9bfcc490ba4163 (patch) | |
| tree | 637b8d1d8947c572ca18f819a76698b2e2850417 | |
| parent | 14746407c80ebbc2a15313cbc12cd70cc9a716d6 (diff) | |
Fix Emacs icon name clash problem
| -rw-r--r-- | generic/proof-toolbar.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/generic/proof-toolbar.el b/generic/proof-toolbar.el index a8164b08..ede8867b 100644 --- a/generic/proof-toolbar.el +++ b/generic/proof-toolbar.el @@ -217,17 +217,20 @@ to the default toolbar." (mapcar (lambda (buttons) (let ((var (car buttons)) - (iconfiles (mapcar (lambda (name) - (concat proof-images-directory - name - icontype)) (cdr buttons)))) + (iconfiles + (mapcar (lambda (name) + (concat proof-images-directory + "pg-" ;; added 1.3.04 to avoid Emacs clashes + name + icontype)) (cdr buttons)))) (set var (if proof-running-on-XEmacs ;; On XEmacs, icon variable holds a list of glyphs (toolbar-make-button-list iconfiles) ;; On GNU emacs, it holds a filename for the icon, - ;; without path or extension. - (eval (cadr buttons)))))) + ;; without path or extension. Warning! This + ;; can lead to name clashes with other packages. + (concat "pg-" (eval (cadr buttons))))))) proof-toolbar-icon-list) (if proof-running-on-XEmacs |