(menu-bar-make-mm-toggle, menu-bar-make-toggle)

(menu-bar-options-menu): Fix list quoting (Bug#4429).

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 07f94a71204bd4b9dc52a4cd84432748b22417eb..aca6d855ece17cee19f31f405b01024470a6e7fc 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -601,9 +601,9 @@ HELP is the text to use for the tooltip.
 PROPS are additional properties."
   `(list 'menu-item  (purecopy ,doc) ',fname
         ,@props
-        ':help (purecopy ,help)
-        ':button '(:toggle . (and (default-boundp ',fname)
-                                  (default-value ',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)
   `(progn
@@ -627,9 +627,9 @@ by \"Save Options\" in Custom buffers.")
        ;; 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)
-                                        (default-value ',variable))))))
+          :help (purecopy ,help)
+          :button '(:toggle . (and (default-boundp ',variable)
+                                   (default-value ',variable))))))
 
 ;; Function for setting/saving default font.
 
@@ -1039,15 +1039,15 @@ mail status in mode line"))
   (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))
-                                        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)
-                                         (not 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]
   (menu-bar-make-toggle toggle-case-fold-search case-fold-search
@@ -1127,7 +1127,7 @@ mail status in mode line"))
   (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))))
 
 \f
 ;; The "Tools" menu items