diff lisp/x-menubar.el @ 211:78478c60bfcd r20-4b4

Import from CVS: tag r20-4b4
author cvs
date Mon, 13 Aug 2007 10:05:51 +0200
parents 41ff10fd062f
children 78f53ef88e17
line wrap: on
line diff
--- a/lisp/x-menubar.el	Mon Aug 13 10:05:01 2007 +0200
+++ b/lisp/x-menubar.el	Mon Aug 13 10:05:51 2007 +0200
@@ -579,7 +579,9 @@
 	    (strokes-mode)
 	  (beep)
 	  (message "This option requires a window system."))
-	:style toggle :selected (and strokes-mode window-system)])
+	:style toggle :selected (and (fboundp strokes-mode)
+				     strokes-mode
+				     window-system)])
       ("Open URLs With"
        ["Emacs-W3" (setq browse-url-browser-function 'browse-url-w3)
 	:style radio
@@ -1293,7 +1295,7 @@
      ;; Mule-specific:
      (if (featurep 'mule)
 	 `(if (featurep 'mule)
-	      (set-language-environment ',(current-language-environment))))
+	      (set-language-environment ',current-language-environment)))
      ))
   "The variables to save; or forms to evaluate to get forms to write out.
 This is used by `save-options-menu-settings' and should mirror the