diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-01-06 16:13:05 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-01-06 16:13:05 +0000 |
| commit | a8bf7299ee74781dd485c33c5eac20aee0f0ebef (patch) | |
| tree | d2bc1c0d3d7a64a19945b5bb5d175cae37088bca /lisp/cus-face.el | |
| parent | e079ecf45241cc5d2904db7ede9592f9861bb9aa (diff) | |
| parent | 600bc46cd52fbdedf592158c6b03ccfca88dbade (diff) | |
| download | emacs-a8bf7299ee74781dd485c33c5eac20aee0f0ebef.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 683-684)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
Diffstat (limited to 'lisp/cus-face.el')
| -rw-r--r-- | lisp/cus-face.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 3e4e32ecc97..c5547657a17 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -353,17 +353,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) |