[Emacs-diffs] emacs/lisp menu-bar.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/04 02:52:53

Modified files:
        lisp           : menu-bar.el 

Log message:
        (menu-bar-make-mm-toggle): Quote each element of `props'.
        (menu-bar-options-menu): Don't quote the `prop' arg of
        `menu-bar-make-mm-toggle'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/menu-bar.el?cvsroot=emacs&r1=1.366&r2=1.367

Patches:
Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -b -r1.366 -r1.367
--- menu-bar.el 3 Nov 2009 07:28:19 -0000       1.366
+++ menu-bar.el 4 Nov 2009 02:52:53 -0000       1.367
@@ -600,7 +600,7 @@
 HELP is the text to use for the tooltip.
 PROPS are additional properties."
   `(list 'menu-item  (purecopy ,doc) ',fname
-        ,@props
+        ,@(mapcar (lambda (p) (list 'quote p)) props)
         :help (purecopy ,help)
         :button '(:toggle . (and (default-boundp ',fname)
                                  (default-value ',fname)))))
@@ -1039,14 +1039,14 @@
   (menu-bar-make-mm-toggle cua-mode
                           "C-x/C-c/C-v Cut and Paste (CUA)"
                           "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"
-                          (:visible '(or (not (boundp 'cua-enable-cua-keys))
+                          (:visible (or (not (boundp 'cua-enable-cua-keys))
                                          cua-enable-cua-keys))))
 
 (define-key menu-bar-options-menu [cua-emulation-mode]
   (menu-bar-make-mm-toggle cua-mode
                           "Shift movement mark region (CUA)"
                           "Use shifted movement keys to set and extend the 
region."
-                          (:visible '(and (boundp 'cua-enable-cua-keys)
+                          (:visible (and (boundp 'cua-enable-cua-keys)
                                           (not cua-enable-cua-keys)))))
 
 (define-key menu-bar-options-menu [case-fold-search]
@@ -1127,7 +1127,7 @@
   (menu-bar-make-mm-toggle transient-mark-mode
                           "Active Region Highlighting"
                           "Make text in active region stand out in color 
(Transient Mark mode)"
-                          (:enable '(not cua-mode))))
+                          (:enable (not cua-mode))))
 
 
 ;; The "Tools" menu items