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

* custom.el: Move Custom Themes commentary to start of theme code.

Browse source 
(custom-known-themes): Rename `standard' theme to `changed'.
	(custom-push-theme): Caller no longer specifies what theme to use
	when doing `reset'---the setting is simply removed from the theme.
	Delete MODE from `theme-value' and `theme-settings' properties.
	(custom-declare-theme): Ignore &rest args since we don't use them.

	(custom-loaded-themes): Delete variable.
	(custom-theme-load-themes, custom-theme-loaded-p)
	(custom-theme-value): Delete functions.

	(custom-declare-theme): Signal error on invalid theme names.
	(provide-theme): custom-loaded-themes was deleted.
	(load-theme): Load the file unconditionally.
	(enable-theme): Call `load-theme' if theme is undefined.
	(custom-enabled-themes): Only update value for successful loads.
	(disable-theme): Complete from enabled themes when interactive.
	(custom-variable-theme-value): Calculate theme value directly.

	(custom-theme-reset-variables, custom-reset-variables): Mark as
	XEmacs compatibility functions.  We don't actually use these.

	* cus-edit.el (custom-variable-state-set): Use
	custom-variable-theme-value instead of custom-theme-value.
	(custom-face-state-set): Rename `standard' theme to `changed'.
	(custom-save-variables, custom-save-faces): Delete unneeded
	references to custom-reset-variables.
	(custom-save-resets): Delete function.
	(custom-save-variables, custom-save-faces): MODE argument deleted.
	(custom-save-variables, custom-save-faces): Ignore theme values.

	* cus-face.el (custom-theme-reset-faces): Mark as XEmacs
	compatibility function.
This commit is contained in:
Chong Yidong 2006-01-02 15:11:14 +00:00
parent 55262b16df
commit d358aa106d
4 changed files with 218 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/cus-face.el
View file

@ -350,17 +350,20 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
(custom-push-theme 'theme-face face theme 'set spec))
(setq args (cdr (cdr args))))))))
;; XEmacs compability function. In XEmacs, when you reset a Custom
;; Theme, you have to specify the theme to reset it to. We just apply
;; the next theme.
;;;###autoload
(defun custom-theme-reset-faces (theme &rest args)
"Reset the specs in THEME of some faces to their specs in other themes.
Each of the arguments ARGS has this form:
(FACE FROM-THEME)
(FACE IGNORED)
This means reset FACE to its value in FROM-THEME."
This means reset FACE. The argument IGNORED is ignored."
(custom-check-theme theme)
(dolist (arg args)
(custom-push-theme 'theme-face (car arg) theme 'reset (cadr arg))))
(custom-push-theme 'theme-face (car arg) theme 'reset)))
;;;###autoload
(defun custom-reset-faces (&rest args)