[Emacs-diffs] Changes to emacs/lisp/cus-edit.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.185.2.1 emacs/lisp/cus-edit.el:1.185.2.2
*** emacs/lisp/cus-edit.el:1.185.2.1    Fri Apr 16 12:49:48 2004
--- emacs/lisp/cus-edit.el      Mon Jun 28 07:28:27 2004
***************
*** 1012,1022 ****
  
  ;;;###autoload
  (defun customize-face (&optional face)
!   "Customize SYMBOL, which should be a face name or nil.
! If SYMBOL is nil, customize all faces.
  
  Interactively, when point is on text which has a face specified,
! suggest to customized that face, if it's customizable."
    (interactive
     (list (read-face-name "Customize face" "all faces" t)))
    (if (member face '(nil ""))
--- 1012,1022 ----
  
  ;;;###autoload
  (defun customize-face (&optional face)
!   "Customize FACE, which should be a face name or nil.
! If FACE is nil, customize all faces.
  
  Interactively, when point is on text which has a face specified,
! suggest to customize that face, if it's customizable."
    (interactive
     (list (read-face-name "Customize face" "all faces" t)))
    (if (member face '(nil ""))
***************
*** 1038,1047 ****
  
  ;;;###autoload
  (defun customize-face-other-window (&optional face)
!   "Show customization buffer for face SYMBOL in other window.
  
  Interactively, when point is on text which has a face specified,
! suggest to customized that face, if it's customizable."
    (interactive
     (list (read-face-name "Customize face" "all faces" t)))
    (if (member face '(nil ""))
--- 1038,1047 ----
  
  ;;;###autoload
  (defun customize-face-other-window (&optional face)
!   "Show customization buffer for face FACE in other window.
  
  Interactively, when point is on text which has a face specified,
! suggest to customize that face, if it's customizable."
    (interactive
     (list (read-face-name "Customize face" "all faces" t)))
    (if (member face '(nil ""))
***************
*** 1093,1099 ****
                                (get symbol 'standard-value))))
                  (when (and cval       ;Declared with defcustom.
                             (default-boundp symbol) ;Has a value.
!                            (not (equal (eval (car cval)) 
                                         ;; Which does not match customize.
                                         (default-value symbol))))
                    (push (list symbol 'custom-variable) found)))))
--- 1093,1099 ----
                                (get symbol 'standard-value))))
                  (when (and cval       ;Declared with defcustom.
                             (default-boundp symbol) ;Has a value.
!                            (not (equal (eval (car cval))
                                         ;; Which does not match customize.
                                         (default-value symbol))))
                    (push (list symbol 'custom-variable) found)))))
***************
*** 1876,1882 ****
    (custom-load-symbol (widget-value widget)))
  
  (defun custom-unloaded-symbol-p (symbol)
!   "Return non-nil if the dependencies of SYMBOL has not yet been loaded."
    (let ((found nil)
        (loads (get symbol 'custom-loads))
        load)
--- 1876,1882 ----
    (custom-load-symbol (widget-value widget)))
  
  (defun custom-unloaded-symbol-p (symbol)
!   "Return non-nil if the dependencies of SYMBOL have not yet been loaded."
    (let ((found nil)
        (loads (get symbol 'custom-loads))
        load)
***************
*** 1894,1900 ****
      found))
  
  (defun custom-unloaded-widget-p (widget)
!   "Return non-nil if the dependencies of WIDGET has not yet been loaded."
    (custom-unloaded-symbol-p (widget-value widget)))
  
  (defun custom-toggle-hide (widget)
--- 1894,1900 ----
      found))
  
  (defun custom-unloaded-widget-p (widget)
!   "Return non-nil if the dependencies of WIDGET have not yet been loaded."
    (custom-unloaded-symbol-p (widget-value widget)))
  
  (defun custom-toggle-hide (widget)
***************
*** 2074,2084 ****
    :group 'custom-buffer
    :version "20.3")
  
  (define-widget 'custom-variable 'custom
    "Customize variable."
    :format "%v"
    :help-echo "Set or reset this variable."
!   :documentation-property 'variable-documentation
    :custom-category 'option
    :custom-state nil
    :custom-menu 'custom-variable-menu-create
--- 2074,2098 ----
    :group 'custom-buffer
    :version "20.3")
  
+ (defun custom-variable-documentation (variable)
+   "Return documentation of VARIABLE for use in Custom buffer.
+ Normally just return the docstring.  But if VARIABLE automatically
+ becomes buffer local when set, append a message to that effect."
+   (if (and (local-variable-if-set-p variable)
+          (or (not (local-variable-p variable))
+              (with-temp-buffer
+                (local-variable-if-set-p variable))))
+       (concat (documentation-property variable 'variable-documentation)
+             "\n
+ This variable automatically becomes buffer-local when set outside Custom.
+ However, setting it through Custom sets the default value.")
+     (documentation-property variable 'variable-documentation)))
+ 
  (define-widget 'custom-variable 'custom
    "Customize variable."
    :format "%v"
    :help-echo "Set or reset this variable."
!   :documentation-property #'custom-variable-documentation
    :custom-category 'option
    :custom-state nil
    :custom-menu 'custom-variable-menu-create
***************
*** 2646,2652 ****
        (widget-setup)))))
  
  (defun custom-face-edit-delete (widget)
!   "Remove widget from the buffer."
    (let ((inactive (widget-get widget :inactive))
        (inhibit-read-only t)
        (inhibit-modification-hooks t))
--- 2660,2666 ----
        (widget-setup)))))
  
  (defun custom-face-edit-delete (widget)
!   "Remove WIDGET from the buffer."
    (let ((inactive (widget-get widget :inactive))
        (inhibit-read-only t)
        (inhibit-modification-hooks t))
***************
*** 2729,2734 ****
--- 2743,2752 ----
  Match frames with no color support.")
                                           mono)))
                  (group :sibling-args (:help-echo "\
+ The minimum number of colors the frame should support.")
+                        (const :format "" min-colors)
+                        (integer :tag "Minimum number of colors" ))
+                 (group :sibling-args (:help-echo "\
  Only match frames with the specified intensity.")
                         (const :format "\
  Background brightness: "
***************
*** 4023,4028 ****
--- 4041,4047 ----
    (suppress-keymap custom-mode-map)
    (define-key custom-mode-map " " 'scroll-up)
    (define-key custom-mode-map "\177" 'scroll-down)
+   (define-key custom-mode-map "\C-x\C-s" 'Custom-save)
    (define-key custom-mode-map "q" 'Custom-buffer-done)
    (define-key custom-mode-map "u" 'Custom-goto-parent)
    (define-key custom-mode-map "n" 'widget-forward)