Commit c32de15e authored by Per Abrahamsen's avatar Per Abrahamsen
Browse files

Synched with 1.9908.

parent 0ce5b5d5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
;; ;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: help, faces ;; Keywords: help, faces
;; Version: 1.9905 ;; Version: 1.9908
;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -755,6 +755,9 @@ are shown; the contents of those subgroups are initially hidden." ...@@ -755,6 +755,9 @@ are shown; the contents of those subgroups are initially hidden."
(format "*Customize Option: %s*" (format "*Customize Option: %s*"
(custom-unlispify-tag-name symbol)))) (custom-unlispify-tag-name symbol))))
;;;###autoload
(defalias 'customize-variable-other-window 'customize-option-other-window)
;;;###autoload ;;;###autoload
(defun customize-option-other-window (symbol) (defun customize-option-other-window (symbol)
"Customize SYMBOL, which must be a user option variable. "Customize SYMBOL, which must be a user option variable.
...@@ -923,23 +926,26 @@ Make the modifications default for future sessions." ...@@ -923,23 +926,26 @@ Make the modifications default for future sessions."
(if custom-reset-button-menu (if custom-reset-button-menu
(widget-create 'push-button (widget-create 'push-button
:tag "Reset" :tag "Reset"
:help-echo "Undo all modifications." :help-echo "Show a menu with reset operations."
:mouse-down-action (lambda (&rest junk) t) :mouse-down-action (lambda (&rest junk) t)
:action (lambda (widget &optional event) :action (lambda (widget &optional event)
(custom-reset event))) (custom-reset event)))
(widget-create 'push-button (widget-create 'push-button
:tag "Reset" :tag "Reset"
:help-echo "Undo all modifications." :help-echo "\
Reset all visible items in this buffer to their current settings."
:action 'custom-reset-current) :action 'custom-reset-current)
(widget-insert " ") (widget-insert " ")
(widget-create 'push-button (widget-create 'push-button
:tag "Reset to Saved" :tag "Reset to Saved"
:help-echo "Undo all modifications." :help-echo "\
Reset all visible items in this buffer to their saved settings."
:action 'custom-reset-saved) :action 'custom-reset-saved)
(widget-insert " ") (widget-insert " ")
(widget-create 'push-button (widget-create 'push-button
:tag "Reset to Standard" :tag "Reset to Standard"
:help-echo "Undo all modifications." :help-echo "\
Reset all visible items in this buffer to their standard settings."
:action 'custom-reset-standard)) :action 'custom-reset-standard))
(widget-insert " ") (widget-insert " ")
(widget-create 'push-button (widget-create 'push-button
...@@ -953,6 +959,7 @@ Make the modifications default for future sessions." ...@@ -953,6 +959,7 @@ Make the modifications default for future sessions."
(if (= (length options) 1) (if (= (length options) 1)
(mapcar (lambda (entry) (mapcar (lambda (entry)
(widget-create (nth 1 entry) (widget-create (nth 1 entry)
:documentation-shown t
:custom-state 'unknown :custom-state 'unknown
:tag (custom-unlispify-tag-name :tag (custom-unlispify-tag-name
(nth 0 entry)) (nth 0 entry))
...@@ -1069,7 +1076,7 @@ this %c has not been changed with customize." "\ ...@@ -1069,7 +1076,7 @@ this %c has not been changed with customize." "\
something in this group is not prepared for customization.") something in this group is not prepared for customization.")
(standard " " nil "\ (standard " " nil "\
this %c is unchanged from its standard setting." "\ this %c is unchanged from its standard setting." "\
the visible members of this group are all at standard settings.")) visible group members are all at standard settings."))
"Alist of customize option states. "Alist of customize option states.
Each entry is of the form (STATE MAGIC FACE ITEM-DESC [ GROUP-DESC ]), where Each entry is of the form (STATE MAGIC FACE ITEM-DESC [ GROUP-DESC ]), where
...@@ -2550,6 +2557,7 @@ The format is suitable for use with `easy-menu-define'." ...@@ -2550,6 +2557,7 @@ The format is suitable for use with `easy-menu-define'."
(unless custom-mode-map (unless custom-mode-map
(setq custom-mode-map (make-sparse-keymap)) (setq custom-mode-map (make-sparse-keymap))
(set-keymap-parent custom-mode-map widget-keymap) (set-keymap-parent custom-mode-map widget-keymap)
(suppress-keymap custom-mode-map)
(define-key custom-mode-map "q" 'bury-buffer)) (define-key custom-mode-map "q" 'bury-buffer))
(easy-menu-define custom-mode-customize-menu (easy-menu-define custom-mode-customize-menu
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
;; ;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: help, extensions, faces, hypermedia ;; Keywords: help, extensions, faces, hypermedia
;; Version: 1.9905 ;; Version: 1.9908
;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
(set (car keywords) (car keywords))) (set (car keywords) (car keywords)))
(setq keywords (cdr keywords))))))) (setq keywords (cdr keywords)))))))
(define-widget-keywords :button-overlay :field-overlay (define-widget-keywords :complete-function :complete :button-overlay
:field-overlay
:documentation-shown :button-prefix :documentation-shown :button-prefix
:button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive
:prompt-internal :prompt-history :prompt-match :prompt-internal :prompt-history :prompt-match
...@@ -62,8 +63,7 @@ ...@@ -62,8 +63,7 @@
:indent :size :value-to-external :validate :error :directory :indent :size :value-to-external :validate :error :directory
:must-match :type-error :value-inline :inline :match-inline :greedy :must-match :type-error :value-inline :inline :match-inline :greedy
:button-face-get :button-face :value-face :keymap :entry-from :button-face-get :button-face :value-face :keymap :entry-from
:entry-to :help-echo :documentation-property :hide-front-space :entry-to :help-echo :documentation-property :tab-order)
:hide-rear-space :tab-order)
;; These autoloads should be deleted when the file is added to Emacs. ;; These autoloads should be deleted when the file is added to Emacs.
(unless (fboundp 'load-gc) (unless (fboundp 'load-gc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment