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

[Juanma Barranquero]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.330 emacs/lisp/faces.el:1.331
*** emacs/lisp/faces.el:1.330   Tue Jul 19 11:30:29 2005
--- emacs/lisp/faces.el Wed Jul 20 15:38:50 2005
***************
*** 385,391 ****
  (defun face-attribute-merged-with (attribute value faces &optional frame)
    "Merges ATTRIBUTE, initially VALUE, with faces from FACES until absolute.
  FACES may be either a single face or a list of faces.
! \[This is an internal function]"
    (cond ((not (face-attribute-relative-p attribute value))
         value)
        ((null faces)
--- 385,391 ----
  (defun face-attribute-merged-with (attribute value faces &optional frame)
    "Merges ATTRIBUTE, initially VALUE, with faces from FACES until absolute.
  FACES may be either a single face or a list of faces.
! \[This is an internal function.]"
    (cond ((not (face-attribute-relative-p attribute value))
         value)
        ((null faces)
***************
*** 1095,1101 ****
  
  (defun read-face-font (face &optional frame)
    "Read the name of a font for FACE on FRAME.
! If optional argument FRAME Is nil or omitted, use the selected frame."
    (let ((completion-ignore-case t))
      (completing-read (format "Set font attributes of face `%s' from font: " 
face)
                     (x-list-fonts "*" nil frame))))
--- 1095,1101 ----
  
  (defun read-face-font (face &optional frame)
    "Read the name of a font for FACE on FRAME.
! If optional argument FRAME is nil or omitted, use the selected frame."
    (let ((completion-ignore-case t))
      (completing-read (format "Set font attributes of face `%s' from font: " 
face)
                     (x-list-fonts "*" nil frame))))
***************
*** 1103,1109 ****
  
  (defun read-all-face-attributes (face &optional frame)
    "Interactively read all attributes for FACE.
! If optional argument FRAME Is nil or omitted, use the selected frame.
  Value is a property list of attribute names and new values."
    (let (result)
      (dolist (attribute face-attribute-name-alist result)
--- 1103,1109 ----
  
  (defun read-all-face-attributes (face &optional frame)
    "Interactively read all attributes for FACE.
! If optional argument FRAME is nil or omitted, use the selected frame.
  Value is a property list of attribute names and new values."
    (let (result)
      (dolist (attribute face-attribute-name-alist result)
***************
*** 1117,1123 ****
  If optional argument FRAME is nil or omitted, modify the face used
  for newly created frame, i.e. the global face.
  For non-interactive use, `set-face-attribute' is preferred.
! When called from elisp, if FACE is nil, all arguments but FRAME are ignored
  and the face and its settings are obtained by querying the user."
    (interactive)
    (if face
--- 1117,1123 ----
  If optional argument FRAME is nil or omitted, modify the face used
  for newly created frame, i.e. the global face.
  For non-interactive use, `set-face-attribute' is preferred.
! When called from Lisp, if FACE is nil, all arguments but FRAME are ignored
  and the face and its settings are obtained by querying the user."
    (interactive)
    (if face
***************
*** 1316,1322 ****
                (terpri))
              (dolist (a attrs)
                (let ((attr (face-attribute f (car a) frame)))
!                 (insert (make-string (- max-width (length (cdr a))) ?\ )
                          (cdr a) ": " (format "%s" attr) "\n")))))
          (terpri)))
        (print-help-return-message))))
--- 1316,1322 ----
                (terpri))
              (dolist (a attrs)
                (let ((attr (face-attribute f (car a) frame)))
!                 (insert (make-string (- max-width (length (cdr a))) ?\s)
                          (cdr a) ": " (format "%s" attr) "\n")))))
          (terpri)))
        (print-help-return-message))))
***************
*** 1330,1336 ****
  ;; face implementation.
  
  (defun face-attr-construct (face &optional frame)
!   "Return a defface-style attribute list for FACE on FRAME.
  Value is a property list of pairs ATTRIBUTE VALUE for all specified
  face attributes of FACE where ATTRIBUTE is the attribute name and
  VALUE is the specified value of that attribute."
--- 1330,1336 ----
  ;; face implementation.
  
  (defun face-attr-construct (face &optional frame)
!   "Return a `defface'-style attribute list for FACE on FRAME.
  Value is a property list of pairs ATTRIBUTE VALUE for all specified
  face attributes of FACE where ATTRIBUTE is the attribute name and
  VALUE is the specified value of that attribute."
***************
*** 1835,1842 ****
  ;; Update the colors of FACE, after FRAME's own colors have been
  ;; changed.
  
! (defalias 'frame-update-face-colors 'frame-set-background-mode)
! (make-obsolete 'frame-update-face-colors 'frame-set-background-mode "21.1")
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 1835,1842 ----
  ;; Update the colors of FACE, after FRAME's own colors have been
  ;; changed.
  
! (define-obsolete-function-alias 'frame-update-face-colors
!     'frame-set-background-mode "21.1")
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 2055,2061 ****
       ;; because in some cases the display engine will do it's own
       ;; workaround (to `dim' on ttys)
       :slant italic))
!   "Basic italic font."
    :group 'basic-faces)
  
  
--- 2055,2061 ----
       ;; because in some cases the display engine will do it's own
       ;; workaround (to `dim' on ttys)
       :slant italic))
!   "Basic italic face."
    :group 'basic-faces)