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

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/03 07:28:20

Modified files:
        lisp           : menu-bar.el 

Log message:
        (menu-bar-make-mm-toggle, menu-bar-make-toggle)
        (menu-bar-options-menu): Fix list quoting (Bug#4429).

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

Patches:
Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -b -r1.365 -r1.366
--- menu-bar.el 31 Oct 2009 18:03:06 -0000      1.365
+++ menu-bar.el 3 Nov 2009 07:28:19 -0000       1.366
@@ -601,8 +601,8 @@
 PROPS are additional properties."
   `(list 'menu-item  (purecopy ,doc) ',fname
         ,@props
-        ':help (purecopy ,help)
-        ':button '(:toggle . (and (default-boundp ',fname)
+        :help (purecopy ,help)
+        :button '(:toggle . (and (default-boundp ',fname)
                                   (default-value ',fname)))))
 
 (defmacro menu-bar-make-toggle (name variable doc message help &rest body)
@@ -627,8 +627,8 @@
        ;; the user have already set explicitly in his init file.
        (if interactively (customize-mark-as-set ',variable)))
      (list 'menu-item (purecopy ,doc) ',name
-                ':help (purecopy ,help)
-                 ':button '(:toggle . (and (default-boundp ',variable)
+          :help (purecopy ,help)
+          :button '(:toggle . (and (default-boundp ',variable)
                                         (default-value ',variable))))))
 
 ;; Function for setting/saving default font.
@@ -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