# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1257233299 0
# Node ID 72831603960be30a4a6a526734f9ca4abe09d769
# Parent  a120770e3f00bcc85da7e39fbd777b4ff34f2de7
(menu-bar-make-mm-toggle, menu-bar-make-toggle)
(menu-bar-options-menu): Fix list quoting (Bug#4429).

diff -r a120770e3f00 -r 72831603960b lisp/menu-bar.el
--- a/lisp/menu-bar.el	Tue Nov 03 03:29:19 2009 +0000
+++ b/lisp/menu-bar.el	Tue Nov 03 07:28:19 2009 +0000
@@ -601,9 +601,9 @@
 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 @@
        ;; 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 @@
   (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 @@
   (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