Re: Incorrect interactive spec in customize-group

[Stefan Monnier]

> Command customize-group appears to have an  incorrect interactive
> spec --- and consequently fails to prompt for the group to
> customize when called interactively.

Does the patch below fix it?


        Stefan


--- cus-edit.el 26 jui 2007 14:47:51 -0400      1.323
+++ cus-edit.el 27 jui 2007 14:32:06 -0400      
@@ -141,9 +141,9 @@
 
 (require 'cus-face)
 (require 'wid-edit)
-(eval-when-compile
-  (defvar custom-versions-load-alist)  ; from cus-load
-  (defvar recentf-exclude))            ; from recentf.el
+
+(defvar custom-versions-load-alist)    ; from cus-load
+(defvar recentf-exclude)               ; from recentf.el
 
 (condition-case nil
     (require 'cus-load)
@@ -1032,22 +1032,20 @@
                          t nil nil (if group (symbol-name major-mode))))))))
   (customize-group (custom-group-of-mode mode)))
 
-
-;;;###autoload
-(defun customize-group (&optional group prompt-for-group other-window)
-  "Customize GROUP, which must be a customization group."
-  (interactive)
-  (and (null group)
-       (or prompt-for-group (called-interactively-p))
+(defun customize-read-group ()
        (let ((completion-ignore-case t))
-        (setq group
               (completing-read "Customize group (default emacs): "
                                obarray
                                (lambda (symbol)
                                  (or (and (get symbol 'custom-loads)
                                           (not (get symbol 'custom-autoload)))
                                      (get symbol 'custom-group)))
-                               t))))
+                     t)))
+
+;;;###autoload
+(defun customize-group (&optional group)
+  "Customize GROUP, which must be a customization group."
+  (interactive (list (customize-read-group)))
   (when (stringp group)
     (if (string-equal "" group)
        (setq group 'emacs)
@@ -1055,15 +1053,8 @@
   (let ((name (format "*Customize Group: %s*"
                      (custom-unlispify-tag-name group))))
     (if (get-buffer name)
-       (if other-window
-           (let ((pop-up-windows t)
-                 (same-window-buffer-names nil)
-                 (same-window-regexps nil))
-             (pop-to-buffer name))
-         (pop-to-buffer name))
-      (funcall (if other-window
-                  'custom-buffer-create-other-window
-                'custom-buffer-create)
+        (pop-to-buffer name)
+      (custom-buffer-create
               (list (list group 'custom-group))
               name
               (concat " for group "
@@ -1072,8 +1063,11 @@
 ;;;###autoload
 (defun customize-group-other-window (&optional group)
   "Customize GROUP, which must be a customization group, in another window."
-  (interactive)
-  (customize-group group t t))
+  (interactive (list (customize-read-group)))
+  (let ((pop-up-windows t)
+        (same-window-buffer-names nil)
+        (same-window-regexps nil))
+    (customize-group group)))
 
 ;;;###autoload
 (defalias 'customize-variable 'customize-option)
@@ -1254,30 +1248,22 @@
             (< minor1 minor2)))))
 
 ;;;###autoload
-(defun customize-face (&optional face prompt-for-face other-window)
+(defun customize-face (&optional face)
   "Customize FACE, which should be a face name or nil.
 If FACE is nil, customize all faces.  If FACE is actually a
 face-alias, customize the face it is aliased to.
 
 Interactively, when point is on text which has a face specified,
 suggest to customize that face, if it's customizable."
-  (interactive)
-  (and (null face)
-       (or prompt-for-face (called-interactively-p))
-       (setq face (read-face-name "Customize face" "all faces" t)))
+  (interactive (list (read-face-name "Customize face" "all faces" t)))
   (if (member face '(nil ""))
       (setq face (face-list)))
   (if (and (listp face) (null (cdr face)))
       (setq face (car face)))
-  (let ((create-buffer-fn (if other-window
-                             'custom-buffer-create-other-window
-                           'custom-buffer-create)))
     (if (listp face)
-       (funcall create-buffer-fn
+      (custom-buffer-create
                 (custom-sort-items
-                 (mapcar (lambda (s)
-                           (list s 'custom-face))
-                         face)
+        (mapcar (lambda (s) (list s 'custom-face)) face)
                  t nil)
                 "*Customize Faces*")
       ;; If FACE is actually an alias, customize the face it is aliased to.
@@ -1285,10 +1271,10 @@
          (setq face (get face 'face-alias)))
       (unless (facep face)
        (error "Invalid face %S" face))
-      (funcall create-buffer-fn
+    (custom-buffer-create
               (list (list face 'custom-face))
               (format "*Customize Face: %s*"
-                      (custom-unlispify-tag-name face))))))
+             (custom-unlispify-tag-name face)))))
 
 ;;;###autoload
 (defun customize-face-other-window (&optional face)
@@ -1297,8 +1283,11 @@
 
 Interactively, when point is on text which has a face specified,
 suggest to customize that face, if it's customizable."
-  (interactive)
-  (customize-face face t t))
+  (interactive (list (read-face-name "Customize face" "all faces" t)))
+  (let ((pop-up-windows t)
+        (same-window-buffer-names nil)
+        (same-window-regexps nil))
+    (customize-face face)))
 
 (defalias 'customize-customized 'customize-unsaved)