xemacs-beta: lisp/custom/cus-edit.el comparison

comparison lisp/custom/cus-edit.el @ 134:34a5b81f86ba r20-2b1

Import from CVS: tag r20-2b1

author	cvs
date	Mon, 13 Aug 2007 09:30:11 +0200
parents	9b50b4588a93
children	b980b6286996

comparison

equal deleted inserted replaced

-:b27e67717092
+:34a5b81f86ba
 ;;
 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
-;; Version: 1.84
+;; Version: 1.89
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 ;;; Commentary:
 ;;
+;; This file implements the code to create and edit customize buffers.
+;;
 ;; See `custom.el'.
 ;;; Code:
 (require 'cus-face)
 (require 'wid-edit)
 (require 'easymenu)
+(condition-case nil
+(require 'cus-load)
+(error nil))
 (define-widget-keywords :custom-prefixes :custom-menu :custom-show
 :custom-magic :custom-state :custom-level :custom-form
 :custom-set :custom-save :custom-reset-current :custom-reset-saved
 :custom-reset-factory)
 		    (format "Customize variable (default %s): " v)
 		  "Customize variable: ")
 		obarray 'boundp t))
 (list (if (equal val "")
 	       v (intern val)))))
+(defun custom-menu-filter (menu widget)
+"Convert MENU to the form used by `widget-choose'.
+MENU should be in the same format as `custom-variable-menu'.
+WIDGET is the widget to apply the filter entries of MENU on."
+(let ((result nil)
+	current name action filter)
+(while menu
+(setq current (car menu)
+	    name (nth 0 current)
+	    action (nth 1 current)
+	    filter (nth 2 current)
+	    menu (cdr menu))
+(if (or (null filter) (funcall filter widget))
+	  (push (cons name action) result)
+	(push name result)))
+(nreverse result)))
 ;;; Unlispify.
 (defvar custom-prefix-list nil
 "List of prefixes that should be ignored by `custom-unlispify'")
 (when (stringp symbol)
 (if (string-equal "" symbol)
 	(setq symbol 'emacs)
 (setq symbol (intern symbol))))
 (custom-buffer-create (list (list symbol 'custom-group))))
+;;;###autoload
+(defun customize-other-window (symbol)
+"Customize SYMBOL, which must be a customization group."
+(interactive (list (completing-read "Customize group: (default emacs) "
+				      obarray
+				      (lambda (symbol)
+					(get symbol 'custom-group))
+				      t)))
+(when (stringp symbol)
+(if (string-equal "" symbol)
+	(setq symbol 'emacs)
+(setq symbol (intern symbol))))
+(custom-buffer-create-other-window (list (list symbol 'custom-group))))
 ;;;###autoload
 (defun customize-variable (symbol)
 "Customize SYMBOL, which must be a variable."
 (interactive (custom-variable-prompt))
 (define-widget 'custom-magic 'default
 "Show and manipulate state for a customization option."
 :format "%v"
 :action 'widget-choice-item-action
+:notify 'ignore
 :value-get 'ignore
 :value-create 'custom-magic-value-create
 :value-delete 'widget-children-value-delete)
 (defun custom-magic-value-create (widget)
 :help-echo "Expand or collapse this item."
 :action 'custom-level-action)
 (defun custom-level-action (widget &optional event)
 "Toggle visibility for parent to WIDGET."
-(let* ((parent (widget-get widget :parent))
+(custom-toggle-hide (widget-get widget :parent)))
-	 (state (widget-get parent :custom-state)))
-(cond ((memq state '(invalid modified))
-	   (error "There are unset changes"))
-	  ((eq state 'hidden)
-	   (widget-put parent :custom-state 'unknown))
-	  (t
-	   (widget-put parent :custom-state 'hidden)))
-(custom-redraw parent)))
 ;;; The `custom' Widget.
 (define-widget 'custom 'default
 "Customize a user option."
 (custom-magic-reset widget))
 (apply 'widget-default-notify widget args))
 (defun custom-redraw (widget)
 "Redraw WIDGET with current settings."
-(let ((pos (point))
+(let ((line (count-lines (point-min) (point)))
+	(column (current-column))
+	(pos (point))
 	(from (marker-position (widget-get widget :from)))
 	(to (marker-position (widget-get widget :to))))
 (save-excursion
 (widget-value-set widget (widget-value widget))
 (custom-redraw-magic widget))
 (when (and (>= pos from) (<= pos to))
-(goto-char pos))))
+(condition-case nil
+	  (progn
+	    (goto-line line)
+	    (move-to-column column))
+	(error nil)))))
 (defun custom-redraw-magic (widget)
 "Redraw WIDGET state with current settings."
 (while widget
 (let ((magic (widget-get widget :custom-magic)))
 (defun custom-load-widget (widget)
 "Load all dependencies for WIDGET."
 (custom-load-symbol (widget-value widget)))
+(defun custom-toggle-hide (widget)
+"Toggle visibility of WIDGET."
+(let ((state (widget-get widget :custom-state)))
+(cond ((memq state '(invalid modified))
+	   (error "There are unset changes"))
+	  ((eq state 'hidden)
+	   (widget-put widget :custom-state 'unknown))
+	  (t
+	   (widget-put widget :custom-state 'hidden)))
+(custom-redraw widget)))
 ;;; The `custom-variable' Widget.
 (defface custom-variable-sample-face '((t (:underline t)))
 "Face used for unpushable variable tags."
 :group 'custom-faces)
 	 (state (widget-get widget :custom-state))
 	 (symbol (widget-get widget :value))
 	 (tag (widget-get widget :tag))
 	 (type (custom-variable-type symbol))
 	 (conv (widget-convert type))
+	 (get (or (get symbol 'custom-get) 'default-value))
+	 (set (or (get symbol 'custom-set) 'set-default))
 	 (value (if (default-boundp symbol)
-		    (default-value symbol)
+		    (funcall get symbol)
 		  (widget-get conv :value))))
 ;; If the widget is new, the child determine whether it is hidden.
 (cond (state)
 	  ((custom-show type value)
 	   (setq state 'unknown))
 	   (let* ((value (cond ((get symbol 'saved-value)
 				(car (get symbol 'saved-value)))
 			       ((get symbol 'factory-value)
 				(car (get symbol 'factory-value)))
 			       ((default-boundp symbol)
-				(custom-quote (default-value symbol)))
+				(custom-quote (funcall get symbol)))
 			       (t
 				(custom-quote (widget-get conv :value))))))
 	     (push (widget-create-child-and-convert
 		    widget 'sexp
 		    :button-face 'custom-variable-button-face
 (widget-put widget :children children)))
 (defun custom-variable-state-set (widget)
 "Set the state of WIDGET."
 (let* ((symbol (widget-value widget))
+	 (get (or (get symbol 'custom-get) 'default-value))
 	 (value (if (default-boundp symbol)
-		    (default-value symbol)
+		    (funcall get symbol)
 		  (widget-get widget :value)))
 	 tmp
 	 (state (cond ((setq tmp (get symbol 'customized-value))
 		       (if (condition-case nil
 			       (equal value (eval (car tmp)))
 			 'changed))
 		      (t 'rogue))))
 (widget-put widget :custom-state state)))
 (defvar custom-variable-menu
-'(("Edit" . custom-variable-edit)
+'(("Hide" custom-toggle-hide
-("Edit Lisp" . custom-variable-edit-lisp)
+(lambda (widget)
-("Set" . custom-variable-set)
+(not (memq (widget-get widget :custom-state) '(modified invalid)))))
-("Save" . custom-variable-save)
+("Edit" custom-variable-edit
-("Reset to Current" . custom-redraw)
+(lambda (widget)
-("Reset to Saved" . custom-variable-reset-saved)
+(not (eq (widget-get widget :custom-form) 'edit))))
-("Reset to Factory Settings" . custom-variable-reset-factory))
+("Edit Lisp" custom-variable-edit-lisp
+(lambda (widget)
+(not (eq (widget-get widget :custom-form) 'lisp))))
+("Set" custom-variable-set
+(lambda (widget)
+(eq (widget-get widget :custom-state) 'modified)))
+("Save" custom-variable-save
+(lambda (widget)
+(memq (widget-get widget :custom-state) '(modified set changed rogue))))
+("Reset to Current" custom-redraw
+(lambda (widget)
+(and (default-boundp (widget-value widget))
+	    (memq (widget-get widget :custom-state) '(modified)))))
+("Reset to Saved" custom-variable-reset-saved
+(lambda (widget)
+(and (get (widget-value widget) 'saved-value)
+	    (memq (widget-get widget :custom-state)
+		  '(modified set changed rogue)))))
+("Reset to Factory Settings" custom-variable-reset-factory
+(lambda (widget)
+(and (get (widget-value widget) 'factory-value)
+	    (memq (widget-get widget :custom-state)
+		  '(modified set changed saved rogue))))))
 "Alist of actions for the `custom-variable' widget.
-The key is a string containing the name of the action, the value is a
+Each entry has the form (NAME ACTION FILTER) where NAME is the name of
-lisp function taking the widget as an element which will be called
+the menu entry, ACTION is the function to call on the widget when the
-when the action is chosen.")
+menu is selected, and FILTER is a predicate which takes a `custom-variable'
+widget as an argument, and returns non-nil if ACTION is valid on that
+widget. If FILTER is nil, ACTION is always valid.")
 (defun custom-variable-action (widget &optional event)
 "Show the menu for `custom-variable' WIDGET.
 Optional EVENT is the location for the menu."
 (if (eq (widget-get widget :custom-state) 'hidden)
 	(widget-put widget :custom-state 'unknown)
 	(custom-redraw widget))
 (let* ((completion-ignore-case t)
 	   (answer (widget-choose (custom-unlispify-tag-name
 				   (widget-get widget :value))
-				  custom-variable-menu
+				  (custom-menu-filter custom-variable-menu
+						      widget)
 				  event)))
 (if answer
 	  (funcall answer widget)))))
 (defun custom-variable-edit (widget)
 (widget-put widget :custom-form 'lisp)
 (custom-redraw widget))
 (defun custom-variable-set (widget)
 "Set the current value for the variable being edited by WIDGET."
-(let ((form (widget-get widget :custom-form))
+(let* ((form (widget-get widget :custom-form))
-	(state (widget-get widget :custom-state))
+	 (state (widget-get widget :custom-state))
-	(child (car (widget-get widget :children)))
+	 (child (car (widget-get widget :children)))
-	(symbol (widget-value widget))
+	 (symbol (widget-value widget))
-	val)
+	 (set (or (get symbol 'custom-set) 'set-default))
+	  val)
 (cond ((eq state 'hidden)
 	   (error "Cannot set hidden variable."))
 	  ((setq val (widget-apply child :validate))
 	   (goto-char (widget-get val :from))
 	   (error "%s" (widget-get val :error)))
 	  ((eq form 'lisp)
-	   (set-default symbol (eval (setq val (widget-value child))))
+	   (funcall set symbol (eval (setq val (widget-value child))))
 	   (put symbol 'customized-value (list val)))
 	  (t
-	   (set-default symbol (setq val (widget-value child)))
+	   (funcall set symbol (setq val (widget-value child)))
 	   (put symbol 'customized-value (list (custom-quote val)))))
 (custom-variable-state-set widget)
 (custom-redraw-magic widget)))
 (defun custom-variable-save (widget)
 "Set the default value for the variable being edited by WIDGET."
-(let ((form (widget-get widget :custom-form))
+(let* ((form (widget-get widget :custom-form))
-	(state (widget-get widget :custom-state))
+	 (state (widget-get widget :custom-state))
-	(child (car (widget-get widget :children)))
+	 (child (car (widget-get widget :children)))
-	(symbol (widget-value widget))
+	 (symbol (widget-value widget))
-	val)
+	 (set (or (get symbol 'custom-set) 'set-default))
+	 val)
 (cond ((eq state 'hidden)
 	   (error "Cannot set hidden variable."))
 	  ((setq val (widget-apply child :validate))
 	   (goto-char (widget-get val :from))
 	   (error "%s" (widget-get val :error)))
 	  ((eq form 'lisp)
 	   (put symbol 'saved-value (list (widget-value child)))
-	   (set-default symbol (eval (widget-value child))))
+	   (funcall set symbol (eval (widget-value child))))
 	  (t
 	   (put symbol
 		'saved-value (list (custom-quote (widget-value
 						  child))))
-	   (set-default symbol (widget-value child))))
+	   (funcall set symbol (widget-value child))))
 (put symbol 'customized-value nil)
 (custom-save-all)
 (custom-variable-state-set widget)
 (custom-redraw-magic widget)))
 (defun custom-variable-reset-saved (widget)
 "Restore the saved value for the variable being edited by WIDGET."
-(let ((symbol (widget-value widget)))
+(let* ((symbol (widget-value widget))
+	 (set (or (get symbol 'custom-set) 'set-default)))
 (if (get symbol 'saved-value)
 	(condition-case nil
-	    (set-default symbol (eval (car (get symbol 'saved-value))))
+	    (funcall set symbol (eval (car (get symbol 'saved-value))))
 	  (error nil))
 (error "No saved value for %s" symbol))
 (put symbol 'customized-value nil)
 (widget-put widget :custom-state 'unknown)
 (custom-redraw widget)))
 (defun custom-variable-reset-factory (widget)
 "Restore the factory setting for the variable being edited by WIDGET."
-(let ((symbol (widget-value widget)))
+(let* ((symbol (widget-value widget))
+	 (set (or (get symbol 'custom-set) 'set-default)))
 (if (get symbol 'factory-value)
-	(set-default symbol (eval (car (get symbol 'factory-value))))
+	(funcall set symbol (eval (car (get symbol 'factory-value))))
 (error "No factory default for %S" symbol))
 (put symbol 'customized-value nil)
 (when (get symbol 'saved-value)
 (put symbol 'saved-value nil)
 (custom-save-all))
 "A display specification that doesn't match the selected display."
 :match 'custom-display-unselected-match)
 (defun custom-display-unselected-match (widget value)
 "Non-nil if VALUE is an unselected display specification."
-(and (listp value)
+(not (custom-display-match-frame value (selected-frame))))
-(eq (length value) 2)
-(not (custom-display-match-frame value (selected-frame)))))
 (define-widget 'custom-face-selected 'group
 "Edit the attributes of the selected display in a face specification."
 :args '((repeat :format ""
 		  :inline t
 (custom-face-state-set widget)
 (widget-put widget :children (list edit)))
 (message "Creating face editor...done")))
 (defvar custom-face-menu
-'(("Edit Selected" . custom-face-edit-selected)
+'(("Hide" custom-toggle-hide
-("Edit All" . custom-face-edit-all)
+(lambda (widget)
-("Edit Lisp" . custom-face-edit-lisp)
+(not (memq (widget-get widget :custom-state) '(modified invalid)))))
-("Set" . custom-face-set)
+("Edit Selected" custom-face-edit-selected
-("Save" . custom-face-save)
+(lambda (widget)
-("Reset to Saved" . custom-face-reset-saved)
+(not (eq (widget-get widget :custom-form) 'selected))))
-("Reset to Factory Setting" . custom-face-reset-factory))
+("Edit All" custom-face-edit-all
+(lambda (widget)
+(not (eq (widget-get widget :custom-form) 'all))))
+("Edit Lisp" custom-face-edit-lisp
+(lambda (widget)
+(not (eq (widget-get widget :custom-form) 'lisp))))
+("Set" custom-face-set)
+("Save" custom-face-save)
+("Reset to Saved" custom-face-reset-saved
+(lambda (widget)
+(get (widget-value widget) 'saved-face)))
+("Reset to Factory Setting" custom-face-reset-factory
+(lambda (widget)
+(get (widget-value widget) 'factory-face))))
 "Alist of actions for the `custom-face' widget.
-The key is a string containing the name of the action, the value is a
+Each entry has the form (NAME ACTION FILTER) where NAME is the name of
-lisp function taking the widget as an element which will be called
+the menu entry, ACTION is the function to call on the widget when the
-when the action is chosen.")
+menu is selected, and FILTER is a predicate which takes a `custom-face'
+widget as an argument, and returns non-nil if ACTION is valid on that
+widget. If FILTER is nil, ACTION is always valid.")
 (defun custom-face-edit-selected (widget)
 "Edit selected attributes of the value of WIDGET."
 (widget-put widget :custom-state 'unknown)
 (widget-put widget :custom-form 'selected)
 	(widget-put widget :custom-state 'unknown)
 	(custom-redraw widget))
 (let* ((completion-ignore-case t)
 	   (symbol (widget-get widget :value))
 	   (answer (widget-choose (custom-unlispify-tag-name symbol)
-				  custom-face-menu event)))
+				  (custom-menu-filter custom-face-menu
+						      widget)
+				  event)))
 (if answer
 	  (funcall answer widget)))))
 (defun custom-face-set (widget)
 "Make the face attributes in WIDGET take effect."
 	(widget-put widget :children children)
 	(custom-group-state-update widget)
 	(message "Creating group... done")))))
 (defvar custom-group-menu
-'(("Set" . custom-group-set)
+'(("Hide" custom-toggle-hide
-("Save" . custom-group-save)
+(lambda (widget)
-("Reset to Current" . custom-group-reset-current)
+(not (memq (widget-get widget :custom-state) '(modified invalid)))))
-("Reset to Saved" . custom-group-reset-saved)
+("Set" custom-group-set
-("Reset to Factory" . custom-group-reset-factory))
+(lambda (widget)
+(eq (widget-get widget :custom-state) 'modified)))
+("Save" custom-group-save
+(lambda (widget)
+(memq (widget-get widget :custom-state) '(modified set))))
+("Reset to Current" custom-group-reset-current
+(lambda (widget)
+(and (default-boundp (widget-value widget))
+	    (memq (widget-get widget :custom-state) '(modified)))))
+("Reset to Saved" custom-group-reset-saved
+(lambda (widget)
+(and (get (widget-value widget) 'saved-value)
+	    (memq (widget-get widget :custom-state) '(modified set)))))
+("Reset to Factory" custom-group-reset-factory
+(lambda (widget)
+(and (get (widget-value widget) 'factory-value)
+	    (memq (widget-get widget :custom-state) '(modified set saved))))))
 "Alist of actions for the `custom-group' widget.
-The key is a string containing the name of the action, the value is a
+Each entry has the form (NAME ACTION FILTER) where NAME is the name of
-lisp function taking the widget as an element which will be called
+the menu entry, ACTION is the function to call on the widget when the
-when the action is chosen.")
+menu is selected, and FILTER is a predicate which takes a `custom-group'
+widget as an argument, and returns non-nil if ACTION is valid on that
+widget. If FILTER is nil, ACTION is always valid.")
 (defun custom-group-action (widget &optional event)
 "Show the menu for `custom-group' WIDGET.
 Optional EVENT is the location for the menu."
 (if (eq (widget-get widget :custom-state) 'hidden)
 	(widget-put widget :custom-state 'unknown)
 	(custom-redraw widget))
 (let* ((completion-ignore-case t)
 	   (answer (widget-choose (custom-unlispify-tag-name
 				   (widget-get widget :value))
-				  custom-group-menu
+				  (custom-menu-filter custom-group-menu
+						      widget)
 				  event)))
 (if answer
 	  (funcall answer widget)))))
 (defun custom-group-set (widget)
 (let ((standard-output (current-buffer)))
 (unless (bolp)
 	(princ "\n"))
 (princ "(custom-set-variables")
 (mapatoms (lambda (symbol)
-		  (let ((value (get symbol 'saved-value)))
+		  (let ((value (get symbol 'saved-value))
+			(requests (get symbol 'custom-requests))
+			(now (not (or (get symbol 'factory-value)
+				      (and (not (boundp symbol))
+					   (not (get symbol 'force-value)))))))
 		    (when value
 		      (princ "\n '(")
 		      (princ symbol)
 		      (princ " ")
 		      (prin1 (car value))
-		      (if (or (get symbol 'factory-value)
+		      (cond (requests
-			      (and (not (boundp symbol))
+			     (if now
-				   (not (get symbol 'force-value))))
+				 (princ " t ")
-			  (princ ")")
+			       (princ " nil "))
-			(princ " t)"))))))
+			     (prin1 requests)
+			     (princ ")"))
+			    (now
+			     (princ " t)"))
+			    (t
+			     (princ ")")))))))
 (princ ")")
 (unless (looking-at "\n")
 	(princ "\n")))))
 (defun custom-save-faces ()
 (set-keymap-parent custom-mode-map widget-keymap)
 (define-key custom-mode-map "q" 'bury-buffer))
 (easy-menu-define custom-mode-customize-menu
 custom-mode-map
-"Menu used in customization buffers."
+"Menu used to customize customization buffers."
 (customize-menu-create 'customize))
 (easy-menu-define custom-mode-menu
 custom-mode-map
 "Menu used in customization buffers."

Mercurial > hg > xemacs-beta

comparison lisp/custom/cus-edit.el @ 134:34a5b81f86ba r20-2b1