aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-09-15 02:15:29 +0000
committerRichard M. Stallman1994-09-15 02:15:29 +0000
commit41e7728940ada2a9370cd7b3cd23006b434e1d22 (patch)
treebb419851e05c7d9b0c6954c2710f6be2e6fe7ea6
parent62010a73d81a04e4c2526b30aeba0d852ddd9f3b (diff)
downloademacs-41e7728940ada2a9370cd7b3cd23006b434e1d22.tar.gz
emacs-41e7728940ada2a9370cd7b3cd23006b434e1d22.zip
(facemenu-update): Don't use quoted constant lists
in define-key. Reverse order of menu definitions.
-rw-r--r--lisp/facemenu.el23
1 files changed, 13 insertions, 10 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 1a2d670fac2..f01b493f6d7 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -131,16 +131,19 @@ changing it.")
131 (define-key global-map facemenu-key facemenu-keymap)) 131 (define-key global-map facemenu-key facemenu-keymap))
132 132
133 ;; Define basic keys 133 ;; Define basic keys
134 (define-key facemenu-menu [update] '("Update Menu" . facemenu-update)) 134 ;; We construct this list structure explicitly because a quoted constant
135 (define-key facemenu-menu [display] '("Display" . list-faces-display)) 135 ;; would be pure.
136 (define-key facemenu-menu [sep1] '("-------------")) 136 (define-key facemenu-menu [other] (cons "Other..." 'facemenu-set-face))
137 (define-key facemenu-menu [remove] '("Remove Properties" . 137 (define-key facemenu-menu [sep2] (list "---Special---"))
138 facemenu-remove-all)) 138 (define-key facemenu-menu [invisible] (cons "Invisible"
139 (define-key facemenu-menu [read-only] '("Read-Only". facemenu-set-read-only)) 139 'facemenu-set-invisible))
140 (define-key facemenu-menu [invisible] '("Invisible" 140 (define-key facemenu-menu [read-only] (cons "Read-Only"
141 . facemenu-set-invisible)) 141 'facemenu-set-read-only))
142 (define-key facemenu-menu [sep2] '("---Special---")) 142 (define-key facemenu-menu [remove] (cons "Remove Properties"
143 (define-key facemenu-menu [other] '("Other..." . facemenu-set-face)) 143 'facemenu-remove-all))
144 (define-key facemenu-menu [sep1] (list "-------------"))
145 (define-key facemenu-menu [display] (cons "Display" 'list-faces-display))
146 (define-key facemenu-menu [update] (cons "Update Menu" 'facemenu-update))
144 147
145 ;; Define commands for face-changing 148 ;; Define commands for face-changing
146 (facemenu-iterate 149 (facemenu-iterate