mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* cus-theme.el (custom-theme-add-variable, custom-theme-add-face):

Browse source 
Don't add widget if setting undefined.
This commit is contained in:
Chong Yidong 2006-01-13 02:30:03 +00:00
parent 6c847613ac
commit 4c92479f1b
2 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2006-01-12 Chong Yidong <cyd@stupidchicken.com>
* cus-theme.el (custom-theme-add-variable, custom-theme-add-face):
Don't add widget if setting undefined.
2006-01-12 John Paul Wallington <jpw@pobox.com>
* help-fns.el (describe-variable): Remove newlines from void

54
lisp/cus-theme.el
View file

@ -156,18 +156,21 @@ the directory " custom-theme-directory "\n\n")
(interactive "vVariable name: ")
(save-excursion
(goto-char custom-theme-insert-variable-marker)
(if (assq symbol custom-theme-variables)
(message "%s is already in the theme" (symbol-name symbol))
(widget-insert "\n")
(let ((widget (widget-create 'custom-variable
:tag (custom-unlispify-tag-name symbol)
:custom-level 0
:action 'custom-theme-variable-action
:custom-state 'unknown
:value symbol)))
(push (cons symbol widget) custom-theme-variables)
(custom-magic-reset widget))
(widget-setup))))
(cond ((assq symbol custom-theme-variables)
(message "%s is already in the theme" (symbol-name symbol)))
((not (boundp symbol))
(message "%s is not defined as a variable" (symbol-name symbol)))
(t
(widget-insert "\n")
(let ((widget (widget-create 'custom-variable
:tag (custom-unlispify-tag-name symbol)
:custom-level 0
:action 'custom-theme-variable-action
:custom-state 'unknown
:value symbol)))
(push (cons symbol widget) custom-theme-variables)
(custom-magic-reset widget))
(widget-setup)))))
(defvar custom-theme-variable-menu
`(("Reset to Current" custom-redraw
@ -222,18 +225,21 @@ Optional EVENT is the location for the menu."
(interactive (list (read-face-name "Face name" nil nil)))
(save-excursion
(goto-char custom-theme-insert-face-marker)
(if (assq symbol custom-theme-faces)
(message "%s is already in the theme" (symbol-name symbol))
(widget-insert "\n")
(let ((widget (widget-create 'custom-face
:tag (custom-unlispify-tag-name symbol)
:custom-level 0
:action 'custom-theme-face-action
:custom-state 'unknown
:value symbol)))
(push (cons symbol widget) custom-theme-faces)
(custom-magic-reset widget)
(widget-setup)))))
(cond ((assq symbol custom-theme-faces)
(message "%s is already in the theme" (symbol-name symbol)))
((not (facep symbol))
(message "%s is not defined as a face" (symbol-name symbol)))
(t
(widget-insert "\n")
(let ((widget (widget-create 'custom-face
:tag (custom-unlispify-tag-name symbol)
:custom-level 0
:action 'custom-theme-face-action
:custom-state 'unknown
:value symbol)))
(push (cons symbol widget) custom-theme-faces)
(custom-magic-reset widget)
(widget-setup))))))
(defvar custom-theme-face-menu
`(("Reset to Theme Value" custom-face-reset-theme