*** empty log message ***

[gnus] / lisp / custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index 1fa7f1c..910ef02 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -207,7 +207,7 @@ STRING should be given if the last search was by `string-match' on STRING."
           (funcall 'set-face-underline-p 'underline t))))
 
 (defun custom-xmas-set-text-properties (start end props &optional buffer)
-  (if (or (null buffer) (bufferp buffer))
+  (if (null buffer)
       (if props
          (while props
            (custom-put-text-property 
@@ -260,9 +260,10 @@ into the buffer visible in the event's window."
 
 ;; Put it in the Help menu, if possible.
 (if (string-match "XEmacs" emacs-version)
-    ;; XEmacs (disabled because it doesn't work)
-    (and current-menubar
-        (add-menu-item '("Help") "Customize..." 'customize nil))
+    (if (featurep 'menubar)
+       ;; XEmacs (disabled because it doesn't work)
+       (and current-menubar
+            (add-menu-item '("Help") "Customize..." 'customize t)))
   ;; Emacs 19.28 and earlier
   (global-set-key [ menu-bar help customize ]
                  '("Customize..." . customize))
@@ -1464,7 +1465,8 @@ If optional ORIGINAL is non-nil, consider VALUE for the original value."
 
 (defun custom-face-import (custom value)
   "Modify CUSTOM's VALUE to match internal expectations."
-  (let ((name (symbol-name value)))
+  (let ((name (or (and (facep value) (symbol-name (face-name value)))
+                 (symbol-name value))))
     (list (if (string-match "\
 custom-face-\\(.*\\)-\\(.*\\)-\\(.*\\)-\\(.*\\)-\\(.*\\)-\\(.*\\)"
                            name)