Changeset 4018 for vendor/emacs-CVS_HEAD/lisp/cus-edit.el

Timestamp:

2006年01月28日 09時46分44秒 (3 years ago)

Author:

miyoshi

Message:

Update.

Files:

• vendor/emacs-CVS_HEAD/lisp/cus-edit.el (modified) (75 diffs)

vendor/emacs-CVS_HEAD/lisp/cus-edit.el

@@ -2 +2 @@
-;;
-;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-
+, 2006
-;;
-;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
@@ -89 +89 @@
-
-;; You can see (and modify and save) this unevaluated value by selecting
-initial Lisp e
+Saved Lisp E
-;; give you the unevaluated saved value, if any, otherwise the
-;; unevaluated standard value.
@@ -122 +122 @@
-
-;;    There is no standard value.  This means that the variable was
-
-
-
-
+
+
+
+
+
-;;    `customize-option' non-interactively.
-
@@ -458 +459 @@
-  :link '(custom-manual "(emacs)Windows")
-  :group 'environment)
+
+(defgroup mac nil
+  "Mac specific features."
+  :link '(custom-manual "(emacs)Mac OS")
+  :group 'environment
+  :version "22.1"
+  :prefix "mac-")
-
-;;; Utilities.
@@ -499 +507 @@
-          val)
-     (setq val (completing-read
-option
-option
+variable
+variable
-                obarray 'custom-variable-p t nil nil default))
-     (list (if (equal val "")
@@ -612 +620 @@
-customize."
-  :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))
-ize
+-buffer
-
-(defcustom custom-guess-doc-alist
@@ -626 +634 @@
-customize."
-  :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))
-ize
+-buffer
-
-(defun custom-guess-type (symbol)
@@ -737 +745 @@
-
-(defun Custom-set ()
-changes in all modified options
+the current value of all edited settings in the buffer
-  (interactive)
-  (let ((children custom-options))
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-(defun Custom-save ()
-
+
+
+
-  (interactive)
-  (let ((children custom-options))
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defvar custom-reset-menu
-Current
-
-setting
+Undo Edits
+Reset to 
+value
-  "Alist of actions for the `Reset' button.
-The key is a string containing the name of the action, the value is a
@@ -768 +789 @@
-  "Select item from reset menu."
-  (let* ((completion-ignore-case t)
-to
+settings
-                                custom-reset-menu
-                                event)))
@@ -775 +796 @@
-
-(defun Custom-reset-current (&rest ignore)
-modified group members to their current value
+edited settings in the buffer to show their current values
-  (interactive)
-  (let ((children custom-options))
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-(defun Custom-reset-saved (&rest ignore)
-
+
+
-  (interactive)
-  (let ((children custom-options))
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-(defun Custom-reset-standard (&rest ignore)
-  "Erase all customization (either current or saved) for the group members.
-setting
-setting
+value
+value
-making them as if they had never been customized at all."
-  (interactive)
-  (let ((children custom-options))
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-;;; The Customize Commands
@@ -933 +966 @@
-  (funcall (or (get variable 'custom-set) 'set-default) variable value)
-  (put variable 'saved-value (list (custom-quote value)))
-list (custom-quote value)
+custom-quote value
-  (cond ((string= comment "")
-         (put variable 'variable-comment nil)
@@ -976 +1009 @@
-(defun customize-group (group)
-  "Customize GROUP, which must be a customization group."
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  (when (stringp group)
-    (if (string-equal "" group)
@@ -999 +1034 @@
-(defun customize-group-other-window (group)
-  "Customize GROUP, which must be a customization group."
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  (when (stringp group)
-    (if (string-equal "" group)
@@ -1054 +1091 @@
-      (message "`%s' is an alias for `%s'" symbol basevar))))
-
-0.2
+1.1
-  "Version for `customize-changed-options' to refer back to by default.")
+
+;;;###autoload
+(defalias 'customize-changed 'customize-changed-options)
-
-;;;###autoload
-(defun customize-changed-options (since-version)
-user option variables
+settings whose meanings have
-This includes new user option variables and faces, and new
-
-
-
-
-
-
+
+
+
+
+
-
-  (interactive "sCustomize options changed, since version (default all versions): ")
@@ -1211 +1250 @@
-;;;###autoload
-(defun customize-rogue ()
-
+s
-  (interactive)
-  (let ((found nil))
@@ -1249 +1288 @@
-;;;###autoload
-(defun customize-apropos (regexp &optional all)
-user option
+loaded options, faces and group
-If ALL is `options', include only options.
-If ALL is `faces', include only faces.
-If ALL is `groups', include only groups.
-
-
+
+
+
-  (interactive "sCustomize regexp: \nP")
-  (let ((found nil))
@@ -1267 +1307 @@
-                  (when (and (not (memq all '(groups faces)))
-                             (boundp symbol)
+                             (eq (indirect-variable symbol) symbol)
-                             (or (get symbol 'saved-value)
-                                 (custom-variable-p symbol)
-
-
-
+
+
-                    (push (list symbol 'custom-variable) found)))))
-    (if (not found)
@@ -1281 +1321 @@
-;;;###autoload
-(defun customize-apropos-options (regexp &optional arg)
-
-
+
+
+
-  (interactive "sCustomize regexp: \nP")
-  (customize-apropos regexp (or arg 'options)))
@@ -1288 +1329 @@
-;;;###autoload
-(defun customize-apropos-faces (regexp)
-user
+loaded
-  (interactive "sCustomize regexp: \n")
-  (customize-apropos regexp 'faces))
@@ -1294 +1335 @@
-;;;###autoload
-(defun customize-apropos-groups (regexp)
-user
+loaded
-  (interactive "sCustomize regexp: \n")
-  (customize-apropos regexp 'groups))
@@ -1390 +1431 @@
-  "Face used for buttons in customization buffers.")
-
+(defvar custom-button-mouse nil
+  "Mouse face used for buttons in customization buffers.")
+
-(defvar custom-button-pressed nil
-  "Face used for pressed buttons in customization buffers.")
@@ -1404 +1448 @@
-         (setq custom-button
-               (if value 'custom-button 'custom-button-unraised))
+         (setq custom-button-mouse
+               (if value 'custom-button-mouse 'highlight))
-         (setq custom-button-pressed
-               (if value
@@ -1417 +1463 @@
-            (widget-insert description))
-        (widget-insert (format ".
-show active fields; type RET or click mouse-1
-
-
-save the option value.  Saving an option normally edits your
-Invok
+buttons; type RET or click mouse-1 to actuate one.
+
+
+Saving a change normally works by editing your Emacs
+Se
-                               (if custom-raised-buttons
-button
-
-info-link
+text indicate
+ indicate
+custom-manual
-                       :tag "Custom file"
-                       "(emacs)Saving Customizations")
-        (widget-insert
-
-Invok
-info-link
+\n
+Se
+custom-manual
-                       :tag "Help"
-                       :help-echo "Read the online help."
-                       "(emacs)Easy Customization")
-
-
+
+
+
-    (widget-insert " "))
-  (widget-create 'push-button
@@ -1444 +1491 @@
-                 :action (lambda (widget &optional event)
-                           (Custom-set)))
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-Make your editing in this buffer take effect for future Emacs sessions.
-This updates your Emacs initialization file or creates a new one."
-
-(Custom-save
+  
+  (Custom-save)
-  (if custom-reset-button-menu
-      (progn
-        (widget-insert " ")
-        (widget-create 'push-button
-
+ buffer
-                       :help-echo "Show a menu with reset operations."
-                       :mouse-down-action (lambda (&rest junk) t)
@@ -1463 +1518 @@
-    (widget-insert "\n ")
-    (widget-create 'push-button
-Reset
+Undo Edits
-                   :help-echo "\
-Reset all edited text in this buffer to reflect current values."
@@ -1471 +1526 @@
-                   :tag "Reset to Saved"
-                   :help-echo "\
-values in this buffer to their saved setting
+settings in this buffer to their saved value
-                   :action 'Custom-reset-saved)
-    (widget-insert " ")
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  (widget-insert "   ")
-  (widget-create 'push-button
@@ -1547 +1596 @@
-    (pop-to-buffer (custom-get-fresh-buffer name)))
-  (custom-mode)
-
-
-
-
+
+
+
+
+
+
+
+
+
-  (if custom-browse-only-groups
-      (widget-insert "\
@@ -1589 +1643 @@
-    (custom-toggle-parent widget)))
-
-push-button
+custom-group-link
-  "Show parent in other window when activated."
-  :tag "Group"
@@ -1599 +1653 @@
-    (customize-group-other-window (widget-value parent))))
-
-push-button
+custom-group-link
-  "Show parent in other window when activated."
-  :tag "Option"
@@ -1609 +1663 @@
-    (customize-variable-other-window (widget-value parent))))
-
-push-button
+custom-group-link
-  "Show parent in other window when activated."
-  :tag "Face"
@@ -1665 +1719 @@
-  "Link to the manual entry for this customization option."
-  :help-echo "Read the manual entry for this option."
+  :button-face 'custom-link
+  :mouse-face 'highlight
-  :tag "Manual")
-
@@ -1724 +1780 @@
-;; backward-compatibility alias
-(put 'custom-changed-face 'face-alias 'custom-changed)
+
+(defface custom-themed '((((min-colors 88) (class color))
+                           (:foreground "white" :background "blue1"))
+                          (((class color))
+                           (:foreground "white" :background "blue"))
+                          (t
+                           (:slant italic)))
+  "Face used when the customize item has been set by a theme."
+  :group 'custom-magic-faces)
-
-(defface custom-saved '((t (:underline t)))
@@ -1753 +1818 @@
-SAVED and set." "\
-something in this group has been set and saved.")
+    (themed "o" custom-themed "\
+THEMED." "\
+visible group members are all at standard values.")
-    (rogue "@" custom-rogue "\
-you should not see this
+not intended to be customized
-something in this group is not prepared for customization.")
-    (standard " " nil "\
-STANDARD." "\
-setting
+value
-  "Alist of customize option states.
-Each entry is of the form (STATE MAGIC FACE ITEM-DESC [ GROUP-DESC ]), where
@@ -1926 +1994 @@
-(put 'custom-button-face 'face-alias 'custom-button)
-
+(defface custom-button-mouse
+  '((((type x w32 mac) (class color))
+     (:box (:line-width 2 :style released-button)
+           :background "grey90" :foreground "black"))
+    (t
+     nil))
+  "Mouse face for custom buffer buttons if `custom-raised-buttons' is non-nil."
+  :version "22.1"
+  :group 'custom-faces)
+
-(defface custom-button-unraised
-
-
-
-
-
-
-
+
-  "Face for custom buffer buttons if `custom-raised-buttons' is nil."
-  :version "22.1"
@@ -1940 +2012 @@
-(setq custom-button
-      (if custom-raised-buttons 'custom-button 'custom-button-unraised))
+
+(setq custom-button-mouse
+      (if custom-raised-buttons 'custom-button-mouse 'highlight))
-
-(defface custom-button-pressed
@@ -1983 +2058 @@
-;; backward-compatibility alias
-(put 'custom-state-face 'face-alias 'custom-state)
+
+(defface custom-link
+  '((t :inherit link))
+  "Face for links in customization buffers."
+  :version "22.1"
+  :group 'custom-faces)
-
-(define-widget 'custom 'default
@@ -2118 +2199 @@
-      (insert "See also ")
-      (while links
-
+
+
+
+
-              buttons)
-        (setq links (cdr links))
@@ -2152 +2236 @@
-    (and (null (get name 'custom-links)) ;No links of its own.
-         (= (length parents) 1)         ;A single parent.
-
+
+
+
+
+
-                (many (> (length links) 2)))
-           (when links
-             (insert "\nParent documentation: ")
-             (while links
-
+
+
+
+
-                     buttons)
-               (setq links (cdr links))
@@ -2177 +2268 @@
-
-;; like the editable field
-
+
+
+
+
-                            (background light))
-(:background "gray85")
+:background "gray85"
-                          (((class grayscale color)
-                            (background dark))
-(:background "dim gray")
+:background "dim gray"
-                          (t
-(:slant italic)
+:slant italic
-  "Face used for comments on variables or faces"
-  :version "21.1"
@@ -2507 +2601 @@
-                           'set
-                         'changed))
-saved
+theme
-                              (setq temp (get symbol 'saved-variable-comment))
-                              (or tmp temp))
-                       (if (condition-case nil
-
-
+
+
+
+
+
-                             (error nil))
-
+
+
+
+
-                         'changed))
-                      ((setq tmp (get symbol 'standard-value))
@@ -2530 +2630 @@
-
-(defvar custom-variable-menu
-'
+`
-     (lambda (widget)
-       (eq (widget-get widget :custom-state) 'modified)))
-
-
-
-
+
+
+
+
+
+
-     (lambda (widget)
-       (and (default-boundp (widget-value widget))
@@ -2546 +2648 @@
-            (memq (widget-get widget :custom-state)
-                  '(modified set changed rogue)))))
-
-
-
-
-
-
+
+
+
+
+
+
+
-     (lambda (widget)
-       (get (widget-value widget) 'backup-value)))
@@ -2557 +2660 @@
-    ("Add Comment" custom-comment-show custom-comment-invisible-p)
-    ("---" ignore ignore)
-Don't show as Lisp expression
+Show Current Value
-     (lambda (widget)
-       (eq (widget-get widget :custom-form) 'lisp)))
-initial Lisp e
+Saved Lisp E
-     (lambda (widget)
-       (eq (widget-get widget :custom-form) 'edit))))
@@ -2621 +2724 @@
-             (custom-comment-hide comment-widget))
-           (custom-variable-backup-value widget)
+           (custom-push-theme 'theme-value symbol 'user
+                              'set (custom-quote (widget-value child)))
-           (funcall set symbol (eval (setq val (widget-value child))))
-           (put symbol 'customized-value (list val))
@@ -2631 +2736 @@
-             (custom-comment-hide comment-widget))
-           (custom-variable-backup-value widget)
+           (custom-push-theme 'theme-value symbol 'user
+                              'set (custom-quote (widget-value child)))
-           (funcall set symbol (setq val (widget-value child)))
-           (put symbol 'customized-value (list (custom-quote val)))
@@ -2660 +2767 @@
-           (put symbol 'saved-value (list (widget-value child)))
-           (custom-push-theme 'theme-value symbol 'user
-list
+custom-quote
-           (funcall set symbol (eval (widget-value child)))
-           (put symbol 'variable-comment comment)
@@ -2672 +2779 @@
-                (list (custom-quote (widget-value child))))
-           (custom-push-theme 'theme-value symbol 'user
-
-
+
-           (funcall set symbol (widget-value child))
-           (put symbol 'variable-comment comment)
@@ -2685 +2791 @@
-(defun custom-variable-reset-saved (widget)
-  "Restore the saved value for the variable being edited by WIDGET.
+This also updates the buffer to show that value.
-The value that was current before this operation
-becomes the backup value, so you can get it again."
@@ -2694 +2801 @@
-           (put symbol 'variable-comment comment)
-           (custom-variable-backup-value widget)
+           (custom-push-theme 'theme-value symbol 'user 'set (car-safe value))
-           (condition-case nil
-               (funcall set symbol (eval (car value)))
@@ -2711 +2819 @@
-The value that was current before this operation
-becomes the backup value, so you can get it again."
-
-
+
-    (if (get symbol 'standard-value)
-
-
-
+
-      (error "No standard setting known for %S" symbol))
-    (put symbol 'variable-comment nil)
-    (put symbol 'customized-value nil)
-    (put symbol 'customized-variable-comment nil)
+    (custom-push-theme 'theme-value symbol 'user 'reset)
+    (custom-theme-recalc-variable symbol)
-    (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
-      (put symbol 'saved-value nil)
-      (custom-push-theme 'theme-value symbol 'user 'reset 'standard)
-      ;; As a special optimizations we do not (explictly)
-      ;; save resets to standard when no theme set the value.
-      (if (null (cdr (get symbol 'theme-value)))
-          (put symbol 'theme-value nil))
-      (put symbol 'saved-variable-comment nil)
-      (custom-save-all))
@@ -2759 +2861 @@
-        (progn
-          (custom-variable-backup-value widget)
+          (custom-push-theme 'theme-value symbol 'user 'set value)
-          (condition-case nil
-              (funcall set symbol (car value))
@@ -3201 +3304 @@
-
-(defvar custom-face-menu
-
-
+
+
+
+
+
+
-    ("Reset to Saved" custom-face-reset-saved
-     (lambda (widget)
-       (or (get (widget-value widget) 'saved-face)
-           (get (widget-value widget) 'saved-face-comment))))
-
-
-
+
+
+
+
-    ("---" ignore ignore)
-    ("Add Comment" custom-comment-show custom-comment-invisible-p)
-    ("---" ignore ignore)
-
+
+
+
+
-     (lambda (widget)
-       (not (eq (widget-get widget :custom-form) 'all))))
-
-
-
-
+
-     (lambda (widget)
-       (not (eq (widget-get widget :custom-form) 'lisp)))))
@@ -3265 +3373 @@
-                   (or tmp temp))
-                 (if (equal temp comment)
-
+
+
+
+
+
+
-                   'changed))
-                ((get symbol 'face-defface-spec)
@@ -3312 +3425 @@
-      ;; something harmless instead.
-      (face-spec-set symbol '((t :foreground unspecified))))
+    (custom-push-theme 'theme-face symbol 'user 'set value)
-    (put symbol 'customized-face-comment comment)
-    (put symbol 'face-comment comment)
@@ -3317 +3431 @@
-    (custom-redraw-magic widget)))
-
--command
+
-  "Save in `.emacs' the face attributes in WIDGET."
-  (custom-face-save widget)
-  (custom-save-all))
-
-(defun custom-face-save (widget)
-  "Prepare for saving WIDGET's face attributes, but don't write `.emacs'."
-  (let* ((symbol (widget-value widget))
-         (child (car (widget-get widget :children)))
@@ -3333 +3442 @@
-      ;; Make the comment invisible by hand if it's empty
-      (custom-comment-hide comment-widget))
+    (custom-push-theme 'theme-face symbol 'user 'set value)
-    (if (face-spec-choose value)
-        (face-spec-set symbol value)