[Emacs-diffs] Changes to emacs/lisp/cus-face.el

[Chong Yidong]

Index: emacs/lisp/cus-face.el
diff -u emacs/lisp/cus-face.el:1.43 emacs/lisp/cus-face.el:1.44
--- emacs/lisp/cus-face.el:1.43 Fri Nov 25 18:00:10 2005
+++ emacs/lisp/cus-face.el      Mon Jan  2 15:11:14 2006
@@ -350,17 +350,20 @@
          (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)