comparison lisp/faces.el @ 63382:9cbfa983c1cf

(read-face-name): Use complete-in-turn complete non-aliases in preference to face aliases.

63381:23b1ef64a00e

;;; faces.el --- Lisp faces

;; Copyright (C) 1992,1993,1994,1995,1996,1998,1999,2000,2001,2002,2004
;;   Free Software Foundation, Inc.

;; Maintainer: FSF
;; Keywords: internal

if this function returns nil.
If MULTIPLE is non-nil, return a list of faces (possibly only one).
Otherwise, return a single face."
  (let ((faceprop (or (get-char-property (point) 'read-face-name)
		      (get-char-property (point) 'face)))
	faces)
    ;; Make a list of the named faces that the `face' property uses.
    (if (and (listp faceprop)
	     ;; Don't treat an attribute spec as a list of faces.
	     (not (keywordp (car faceprop)))

    ;; If there are none, try to get a face name from the buffer.
    (if (and (null faces)
	     (memq (intern-soft (thing-at-point 'symbol)) (face-list)))
	(setq faces (list (intern-soft (thing-at-point 'symbol)))))

    ;; If we only want one, and the default is more than one,
    ;; discard the unwanted ones now.
    (unless multiple
      (if faces
	  (setq faces (list (car faces)))))

	     (if (or faces string-describing-default)
		 (format "%s (default %s): " prompt
			 (if faces (mapconcat 'symbol-name faces ", ")
			   string-describing-default))
	       (format "%s: " prompt))
	     obarray 'custom-facep t))
	   ;; Canonicalize the output.
	   (output
	    (if (equal input "")
		faces
	      (if (stringp input)

       (internal-frob-font-slant font "i")))
(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1")

(provide 'faces)

;;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6
;;; faces.el ends here

63382:9cbfa983c1cf

;;; faces.el --- Lisp faces

;; Copyright (C) 1992,1993,1994,1995,1996,1998,1999,2000,2001,2002,2004,2005
;;   Free Software Foundation, Inc.

;; Maintainer: FSF
;; Keywords: internal

if this function returns nil.
If MULTIPLE is non-nil, return a list of faces (possibly only one).
Otherwise, return a single face."
  (let ((faceprop (or (get-char-property (point) 'read-face-name)
		      (get-char-property (point) 'face)))
        (aliasfaces nil)
        (nonaliasfaces nil)
	faces)
    ;; Make a list of the named faces that the `face' property uses.
    (if (and (listp faceprop)
	     ;; Don't treat an attribute spec as a list of faces.
	     (not (keywordp (car faceprop)))

    ;; If there are none, try to get a face name from the buffer.
    (if (and (null faces)
	     (memq (intern-soft (thing-at-point 'symbol)) (face-list)))
	(setq faces (list (intern-soft (thing-at-point 'symbol)))))

    ;; Build up the completion tables.
    (mapatoms (lambda (s)
                (if (custom-facep s)
                    (if (get s 'face-alias)
                        (push (symbol-name s) aliasfaces)
                      (push (symbol-name s) nonaliasfaces)))))

    ;; If we only want one, and the default is more than one,
    ;; discard the unwanted ones now.
    (unless multiple
      (if faces
	  (setq faces (list (car faces)))))

	     (if (or faces string-describing-default)
		 (format "%s (default %s): " prompt
			 (if faces (mapconcat 'symbol-name faces ", ")
			   string-describing-default))
	       (format "%s: " prompt))
	     (complete-in-turn nonaliasfaces aliasfaces) nil t))
	   ;; Canonicalize the output.
	   (output
	    (if (equal input "")
		faces
	      (if (stringp input)

       (internal-frob-font-slant font "i")))
(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1")

(provide 'faces)

;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6
;;; faces.el ends here