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

[Richard M. Stallman]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.149 emacs/lisp/cus-edit.el:1.150
*** emacs/lisp/cus-edit.el:1.149        Thu Apr 25 11:44:24 2002
--- emacs/lisp/cus-edit.el      Fri Apr 26 18:31:57 2002
***************
*** 1033,1066 ****
     (format "*Customize Option: %s*" (custom-unlispify-tag-name symbol))))
  
  ;;;###autoload
! (defun customize-face (&optional symbol)
    "Customize SYMBOL, which should be a face name or nil.
  If SYMBOL is nil, customize all faces.
  
  Interactively, when point is on text which has a face specified,
  suggest to customized that face, if it's customizable."
    (interactive
!    (list
!     (let ((face (get-char-property (point) 'face)))
!       (if (and face (symbolp face))
!         (completing-read (format "Customize face (default `%s'): " face)
!                          obarray 'custom-facep t nil nil (symbol-name face))
!       (completing-read "Customize face (default all): "
!                        obarray 'custom-facep t)))))
!   (if (or (null symbol) (and (stringp symbol) (zerop (length symbol))))
        (custom-buffer-create (custom-sort-items
!                            (mapcar (lambda (symbol)
!                                      (list symbol 'custom-face))
!                                    (face-list))
                             t nil)
                            "*Customize Faces*")
!     (when (stringp symbol)
!       (setq symbol (intern symbol)))
!     (unless (symbolp symbol)
!       (error "Should be a symbol %S" symbol))
!     (custom-buffer-create (list (list symbol 'custom-face))
                          (format "*Customize Face: %s*"
!                                 (custom-unlispify-tag-name symbol)))))
  
  ;;;###autoload
  (defun customize-face-other-window (&optional symbol)
--- 1033,1062 ----
     (format "*Customize Option: %s*" (custom-unlispify-tag-name symbol))))
  
  ;;;###autoload
! (defun customize-face (&optional face)
    "Customize SYMBOL, which should be a face name or nil.
  If SYMBOL is nil, customize all faces.
  
  Interactively, when point is on text which has a face specified,
  suggest to customized that face, if it's customizable."
    (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)))
!   (if (listp face)
        (custom-buffer-create (custom-sort-items
!                            (mapcar (lambda (s)
!                                      (list s 'custom-face))
!                                    face)
                             t nil)
                            "*Customize Faces*")
!     (unless (facep face)
!       (error "Invalid face %S"))
!     (custom-buffer-create (list (list face 'custom-face))
                          (format "*Customize Face: %s*"
!                                 (custom-unlispify-tag-name face)))))
  
  ;;;###autoload
  (defun customize-face-other-window (&optional symbol)