emacs: lisp/menu-bar.el comparison

comparison lisp/menu-bar.el @ 43246:c187056ac630

2002-02-11 Per Abrahamsen <abraham@dina.kvl.dk> * toolbar/tool-bar.el (tool-bar-mode): Removed standard value. * menu-bar.el (menu-bar-mode): Ditto. * cus-edit.el (customize-mark-to-save): Always save variables without a standard value. * menu-bar.el (menu-bar-make-toggle): Made it aware of customize. (menu-bar-options-save): Ditto. (menu-bar-showhide-menu): Ditto. (menu-bar-options-menu): Ditto. (menu-bar-scroll-bar-right, menu-bar-scroll-bar-left, menu-bar-scroll-bar-none): Removed. (menu-bar-showhide-scroll-bar-menu): Use customize aware lambda expressions instead. * cus-edit.el (customize-set-value): Return value. (customize-set-variable): Ditto. (customize-save-variable): Ditto. (customize-set-variable): Load dependencies before setting value. (custom-load-symbol): Autoload it. (customize-mark-as-set): New function.

author	Per Abrahamsen <abraham@dina.kvl.dk>
date	Mon, 11 Feb 2002 16:47:55 +0000
parents	40a928d7f124
children	bccb026d40e4

comparison

equal deleted inserted replaced

-:6a3915789e36
+:c187056ac630
 (defun ,name ()
 ,(concat "Toggle whether to " (downcase (substring help 0 1))
 		(substring help 1) ".")
 (interactive)
 (if ,(if body `(progn . ,body)
-	      `(setq ,variable (not ,variable)))
+	      `(progn
-	   (message ,message "enabled")
+		 (custom-load-symbol ',variable)
+		 (let ((set (or (get ',variable 'custom-set) 'set-default))
+		       (get (or (get ',variable 'custom-get) 'default-value)))
+		   (funcall set ',variable (not (funcall get ',variable))))))
+	   (message ,message "enabled")
 	 (message ,message "disabled")))
-'(menu-item ,doc ,name
+;; The function `customize-mark-as-set' must only be called when
+;; a variable is set interactively, as the purpose is to mark it
+;; as a candidate for "Save Options", and we do not want to save
+;; options the user have already set explicitly in his init
+;; file.  Unfortunately, he could very likely call the function
+;; defined above there.  So we put `customize-mark-as-set' in a
+;; lambda expression.
+;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
+'(menu-item ,doc (lambda ()
+			(interactive)
+			(,name)
+			(customize-mark-as-set ',variable))
 		 :help ,help
-:button (:toggle . (and (boundp ',variable) ,variable)))))
+:button (:toggle . (and (default-boundp ',variable)
+					 (default-value ',variable))))))
 ;;; Assemble all the top-level items of the "Options" menu
 (define-key menu-bar-options-menu [customize]
 (list 'menu-item "Customize Emacs" menu-bar-custom-menu
 	:help "Full customization of every Emacs feature"))
 (defun menu-bar-options-save ()
 "Save current values of Options menu items using Custom."
 (interactive)
 (let ((need-save nil))
-(dolist (elt '(debug-on-quit debug-on-error auto-compression-mode
+;; These are set with `customize-set-variable'.
+(dolist (elt '(line-number-mode column-number-mode scroll-bar-mode
+		   debug-on-quit debug-on-error menu-bar-mode tool-bar-mode
+		   save-place uniquify-buffer-name-style
 		   case-fold-search truncate-lines show-paren-mode
 		   transient-mark-mode global-font-lock-mode
-		   current-language-environment default-input-method
+		   display-time-mode auto-compression-mode
-		   default-frame-alist display-time-mode
+		   ;; Saving `text-mode-hook' is somewhat questionable,
-		   line-number-mode column-number-mode))
+		   ;; as we might get more than we bargain for, if
+		   ;; other code may has added hooks as well.
+		   ;; Nonetheless, not saving it would like be confuse
+		   ;; more often.
+		   ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
+		   text-mode-hook))
+(and (get elt 'customized-value)
+	   (customize-mark-to-save elt)
+	   (setq need-save t)))
+;; These are set with other functions.
+(dolist (elt '(current-language-environment default-input-method))
 (when (customize-mark-to-save elt)
 	(setq need-save t)))
-;; We only want to save text-mode-hook after adding or removing auto fill.
-(and (or (memq 'turn-on-auto-fill text-mode-hook) ;Added.
-	     ;; If it is already saved, it is safe to save.
-	     (get 'text-mode-hook 'saved-value)) ;Maybe removed.
-	 (customize-mark-to-save 'text-mode-hook)
-	 (setq need-save t))
-;; Avoid loading extra libraries.
-(and (featurep 'saveplace)
-	 (customize-mark-to-save 'save-place)
-	 (setq need-save t))
-(and (featurep 'uniquify)
-	 (customize-mark-to-save 'uniquify-buffer-name-style)
-	 (setq need-save t))
 ;; Save if we changed anything.
 (when need-save
 (custom-save-all))))
 (define-key menu-bar-options-menu [save]
 (if (display-time-mode)
 (message "Display-time mode enabled.")
 (message "Display-time mode disabled.")))
 (define-key menu-bar-showhide-menu [showhide-date-time]
-'(menu-item "Date and time" showhide-date-time
+'(menu-item "Date and time" (lambda ()
+				(interactive)
+				(showhide-date-time)
+				(customize-mark-as-set 'display-time-mode))
 	      :help "Display date and time in the mode-line"
 	      :button (:toggle . display-time-mode)))
 (define-key menu-bar-showhide-menu [datetime-separator]
 '("--"))
 (defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar"))
-(defun menu-bar-scroll-bar-right ()
-"Turn on the scroll-bar on the right side."
-(interactive)
-(set-scroll-bar-mode 'right))
-(defun menu-bar-scroll-bar-left ()
-"Turn on the scroll-bar on the left side."
-(interactive)
-(set-scroll-bar-mode 'left))
-(defun menu-bar-scroll-bar-none ()
-"Turn off the scroll-bar."
-(interactive)
-(set-scroll-bar-mode nil))
 (define-key menu-bar-showhide-scroll-bar-menu [right]
-'(menu-item "On the Right" menu-bar-scroll-bar-right
+'(menu-item "On the Right"
+	      (lambda ()
+		(interactive)
+		(customize-set-variable 'scroll-bar-mode 'right))
 	      :help "Scroll-bar on the right side"
 	      :visible window-system
-	      :button (:radio . (eq (cdr (assq 'vertical-scroll-bars (frame-parameters))) 'right))))
+	      :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
+					       (frame-parameters))) 'right))))
 (define-key menu-bar-showhide-scroll-bar-menu [left]
-'(menu-item "On the Left" menu-bar-scroll-bar-left
+'(menu-item "On the Left"
+	      (lambda ()
+		(interactive)
+		(customize-set-variable 'scroll-bar-mode 'left))
 	      :help "Scroll-bar on the left side"
 	      :visible window-system
-	      :button (:radio . (eq (cdr (assq 'vertical-scroll-bars (frame-parameters))) 'left))))
+	      :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
+					       (frame-parameters))) 'left))))
 (define-key menu-bar-showhide-scroll-bar-menu [none]
-'(menu-item "None" menu-bar-scroll-bar-none
+'(menu-item "None"
+	      (lambda ()
+		(interactive)
+		(customize-set-variable 'scroll-bar-mode nil))
 	      :help "Turn off scroll-bar"
 	      :visible window-system
-	      :button (:radio . (eq (cdr (assq 'vertical-scroll-bars (frame-parameters))) nil))))
+	      :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
+					       (frame-parameters))) nil))))
 (define-key menu-bar-showhide-menu [showhide-scroll-bar]
 (list 'menu-item "Scroll-Bar" menu-bar-showhide-scroll-bar-menu
 	:visible 'window-system
 	:help "Select scroll-bar mode"))
 (if menu-bar-mode
 (message "Menu-bar mode enabled.")
 (message "Menu-bar mode disabled.  Use M-x menu-bar-mode to make the menu bar appear.")))
 (define-key menu-bar-showhide-menu [showhide-menu-bar]
-'(menu-item "Menu-bar" showhide-menu-bar
+'(menu-item "Menu-bar"
+	      (lambda ()
+		(interactive)
+		(showhide-menu-bar)
+		(customize-mark-as-set 'menu-bar-mode))
 	      :help "Toggle menu-bar on/off"
 	      :button (:toggle . menu-bar-mode)))
 (defun showhide-tool-bar ()
 "Toggle whether to turn tool-bar on/off."
 (if (tool-bar-mode)
 (message "Tool-bar mode enabled.")
 (message "Tool-bar mode disabled.")))
 (define-key menu-bar-showhide-menu [showhide-tool-bar]
-'(menu-item "Tool-bar" showhide-tool-bar
+'(menu-item "Tool-bar"
+	      (lambda ()
+		(interactive)
+		(showhide-tool-bar)
+		(customize-mark-as-set 'tool-bar-mode))
 	      :help "Turn tool-bar on/off"
 	      :visible window-system
 	      :button (:toggle . tool-bar-mode)))
 (define-key menu-bar-options-menu [showhide]
 			"Enter Lisp debugger when an error is signaled"))
 (define-key menu-bar-options-menu [debugger-separator]
 '("--"))
 (define-key menu-bar-options-menu [toggle-auto-compression]
 '(menu-item "Automatic File De/compression"
-auto-compression-mode
+	      (lambda ()
-	     :help "Transparently decompress compressed files"
+		(interactive)
-:button (:toggle . (rassq 'jka-compr-handler
+		(auto-compression-mode)
-				       file-name-handler-alist))))
+		(customize-mark-as-set 'auto-compression-mode))
+	      :help "Transparently decompress compressed files"
+	      :button (:toggle . (rassq 'jka-compr-handler
+					file-name-handler-alist))))
 (define-key menu-bar-options-menu [save-place]
 (menu-bar-make-toggle toggle-save-place-globally save-place
 			"Save Place in Files between Sessions"
 			"Saving place in files %s"
-			"Save Emacs state for next session"
+			"Save Emacs state for next session"))
-(require 'saveplace)
-			(setq-default save-place
-				      (not (default-value save-place)))))
 (define-key menu-bar-options-menu [uniquify]
 (menu-bar-make-toggle toggle-uniquify-buffer-names uniquify-buffer-name-style
 			"Use Directory Names in Buffer Names"
 			"Directory name in buffer names (uniquify) %s"
 			"Uniquify buffer names by adding parent directory names"
 			(require 'uniquify)
 			(setq uniquify-buffer-name-style
 			      (if (not uniquify-buffer-name-style)
 				  'forward))))
 (define-key menu-bar-options-menu [edit-options-separator]
 '("--"))
 (define-key menu-bar-options-menu [case-fold-search]
 (menu-bar-make-toggle toggle-case-fold-search case-fold-search
 			"Case-Insensitive Search"
 			"Case-Insensitive Search %s"
 			"Ignore letter-case in search"))
 (define-key menu-bar-options-menu [auto-fill-mode]
 '(menu-item "Word Wrap in Text Modes (Auto Fill)"
-toggle-text-mode-auto-fill
+(lambda ()
+		(interactive)
+		(toggle-text-mode-auto-fill)
+		;; This is somewhat questionable, as `text-mode-hook'
+		;; might have changed outside customize.
+		;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
+		(customize-mark-as-set 'text-mode-hook))
 	      :help "Automatically fill text between left and right margins"
 :button (:toggle . (member 'turn-on-auto-fill text-mode-hook))))
 (define-key menu-bar-options-menu [truncate-lines]
 (menu-bar-make-toggle
 toggle-truncate-lines truncate-lines
 "Truncate Long Lines in this Buffer" "Long Line Truncation %s"
 "Truncate long lines on the screen"
-(prog1 (setq truncate-lines (not truncate-lines))
+;; FIXME: We should define a :set method for `truncate-lines' to do
+;; the `buffer-modified-p' stuff.
+;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
+(prog1 (setq-default truncate-lines (not truncate-lines))
 (set-buffer-modified-p (buffer-modified-p)))))
 (define-key menu-bar-options-menu [highlight-separator]
 '("--"))
 (define-key menu-bar-options-menu [highlight-paren-mode]
 (menu-bar-make-toggle toggle-highlight-paren-mode show-paren-mode
 			"Paren Match Highlighting (Show Paren mode)"
 			"Show Paren mode %s"
-			"Highlight matching/mismatched parentheses at cursor"
+			"Highlight matching/mismatched parentheses at cursor"))
-			(show-paren-mode)))
 (define-key menu-bar-options-menu [transient-mark-mode]
 (menu-bar-make-toggle toggle-transient-mark-mode transient-mark-mode
 			"Active Region Highlighting (Transient Mark mode)"
 			"Transient Mark mode %s"
 			"Make text in active region stand out in color"))
 (define-key menu-bar-options-menu [toggle-global-lazy-font-lock-mode]
 (menu-bar-make-toggle toggle-global-lazy-font-lock-mode global-font-lock-mode
 			"Syntax Highlighting (Global Font Lock mode)"
 			"Global Font Lock mode %s"
-			"Colorize text based on language syntax"
+			"Colorize text based on language syntax"))
-			(global-font-lock-mode)))
 ;; The "Tools" menu items
 (defun send-mail-item-name ()
 	 (menu-bar-mode (or value 0)))
 :initialize 'custom-initialize-default
 :type 'boolean
 :group 'frames)
+;;; `menu-bar-mode' doesn't really have a standard value, as it depend
+;;; on where and how Emacs was started.  By removing the standard
+;;; value, we ensure that customize will always save it.
+;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
+(put 'menu-bar-mode 'standard-value nil)
 (defun menu-bar-mode (&optional flag)
 "Toggle display of a menu bar on each frame.
 This command applies to all frames that exist and frames to be
 created in the future.
 With a numeric argument, if the argument is positive,

Mercurial > emacs

comparison lisp/menu-bar.el @ 43246:c187056ac630