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

Timestamp:

11/01/05 07:08:22 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

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

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

@@ -1378 +1378 @@
-  (quit-window custom-buffer-done-kill))
-
+(defvar custom-button nil
+  "Face used for buttons in customization buffers.")
+
+(defvar custom-button-pressed nil
+  "Face used for pressed buttons in customization buffers.")
+
-(defcustom custom-raised-buttons (not (equal (face-valid-attribute-values :box)
-                                             '(("unspecified" . unspecified))))
@@ -1384 +1390 @@
-  :type 'boolean
-  :version "21.1"
-
+
+
+
+
+
+
+
+
+
-
-(defun custom-buffer-create-internal (options &optional description)
@@ -1897 +1911 @@
-    (t
-     nil))
-used for buttons in customization buffers
+for custom buffer buttons if `custom-raised-buttons' is non-nil
-  :version "21.1"
-  :group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-button-face 'face-alias 'custom-button)
+
+(defface custom-button-unraised
+  '((((min-colors 88)
+      (class color) (background light)) :foreground "blue1" :underline t)
+    (((class color) (background light)) :foreground "blue" :underline t)
+    (((min-colors 88)
+      (class color) (background dark)) :foreground "cyan1" :underline t)
+    (((class color) (background dark)) :foreground "cyan" :underline t)
+    (t :underline t))
+  "Face for custom buffer buttons if `custom-raised-buttons' is nil."
+  :version "22.1"
+  :group 'custom-faces)
+
+(setq custom-button
+      (if custom-raised-buttons 'custom-button 'custom-button-unraised))
-
-(defface custom-button-pressed
@@ -1909 +1938 @@
-    (t
-     (:inverse-video t)))
-used for buttons in customization buffers
+for pressed custom buttons if `custom-raised-buttons' is non-nil
-  :version "21.1"
-  :group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-button-pressed-face 'face-alias 'custom-button-pressed)
+
+(defface custom-button-pressed-unraised
+  '((default :inherit custom-button-unraised)
+    (((class color) (background light)) :foreground "magenta4")
+    (((class color) (background dark)) :foreground "violet"))
+  "Face for pressed custom buttons if `custom-raised-buttons' is nil."
+  :version "22.1"
+  :group 'custom-faces)
+
+(setq custom-button-pressed
+  (if custom-raised-buttons
+      'custom-button-pressed
+    'custom-button-pressed-unraised))
-
-(defface custom-documentation nil
@@ -4246 +4288 @@
-    (define-key map "n" 'widget-forward)
-    (define-key map "p" 'widget-backward)
-Custom
+widget
-    map)
-  "Keymap for `custom-mode'.")
-
-(defun Custom-move-and-invoke (event)
-  "Move to where you click, and if it is an active field, invoke it."
-  (interactive "e")
-  (mouse-set-point event)
-  (if (widget-event-point event)
-      (let* ((pos (widget-event-point event))
-             (button (get-char-property pos 'button)))
-        (if button
-            (widget-button-click event)))))
-
-(easy-menu-define Custom-mode-menu
@@ -4322 +4354 @@
-  (setq widget-documentation-face 'custom-documentation)
-  (make-local-variable 'widget-button-face)
-
-
-
-
+
+
+
+
+
-  ;; When possible, use relief for buttons, not bracketing.  This test
-  ;; may not be optimal.