/[emacs]/emacs/lisp/faces.el
ViewVC logotype

Diff of /emacs/lisp/faces.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.330 by jurta, Tue Jul 19 11:30:29 2005 UTC revision 1.331 by lektu, Wed Jul 20 15:38:50 2005 UTC
# Line 385  completely specified)." Line 385  completely specified)."
385  (defun face-attribute-merged-with (attribute value faces &optional frame)  (defun face-attribute-merged-with (attribute value faces &optional frame)
386    "Merges ATTRIBUTE, initially VALUE, with faces from FACES until absolute.    "Merges ATTRIBUTE, initially VALUE, with faces from FACES until absolute.
387  FACES may be either a single face or a list of faces.  FACES may be either a single face or a list of faces.
388  \[This is an internal function]"  \[This is an internal function.]"
389    (cond ((not (face-attribute-relative-p attribute value))    (cond ((not (face-attribute-relative-p attribute value))
390           value)           value)
391          ((null faces)          ((null faces)
# Line 1095  of a global face.  Value is the new attr Line 1095  of a global face.  Value is the new attr
1095    
1096  (defun read-face-font (face &optional frame)  (defun read-face-font (face &optional frame)
1097    "Read the name of a font for FACE on FRAME.    "Read the name of a font for FACE on FRAME.
1098  If optional argument FRAME Is nil or omitted, use the selected frame."  If optional argument FRAME is nil or omitted, use the selected frame."
1099    (let ((completion-ignore-case t))    (let ((completion-ignore-case t))
1100      (completing-read (format "Set font attributes of face `%s' from font: " face)      (completing-read (format "Set font attributes of face `%s' from font: " face)
1101                       (x-list-fonts "*" nil frame))))                       (x-list-fonts "*" nil frame))))
# Line 1103  If optional argument FRAME Is nil or omi Line 1103  If optional argument FRAME Is nil or omi
1103    
1104  (defun read-all-face-attributes (face &optional frame)  (defun read-all-face-attributes (face &optional frame)
1105    "Interactively read all attributes for FACE.    "Interactively read all attributes for FACE.
1106  If optional argument FRAME Is nil or omitted, use the selected frame.  If optional argument FRAME is nil or omitted, use the selected frame.
1107  Value is a property list of attribute names and new values."  Value is a property list of attribute names and new values."
1108    (let (result)    (let (result)
1109      (dolist (attribute face-attribute-name-alist result)      (dolist (attribute face-attribute-name-alist result)
# Line 1117  Value is a property list of attribute na Line 1117  Value is a property list of attribute na
1117  If optional argument FRAME is nil or omitted, modify the face used  If optional argument FRAME is nil or omitted, modify the face used
1118  for newly created frame, i.e. the global face.  for newly created frame, i.e. the global face.
1119  For non-interactive use, `set-face-attribute' is preferred.  For non-interactive use, `set-face-attribute' is preferred.
1120  When called from elisp, if FACE is nil, all arguments but FRAME are ignored  When called from Lisp, if FACE is nil, all arguments but FRAME are ignored
1121  and the face and its settings are obtained by querying the user."  and the face and its settings are obtained by querying the user."
1122    (interactive)    (interactive)
1123    (if face    (if face
# Line 1316  If FRAME is omitted or nil, use the sele Line 1316  If FRAME is omitted or nil, use the sele
1316                  (terpri))                  (terpri))
1317                (dolist (a attrs)                (dolist (a attrs)
1318                  (let ((attr (face-attribute f (car a) frame)))                  (let ((attr (face-attribute f (car a) frame)))
1319                    (insert (make-string (- max-width (length (cdr a))) ?\ )                    (insert (make-string (- max-width (length (cdr a))) ?\s)
1320                            (cdr a) ": " (format "%s" attr) "\n")))))                            (cdr a) ": " (format "%s" attr) "\n")))))
1321            (terpri)))            (terpri)))
1322        (print-help-return-message))))        (print-help-return-message))))
# Line 1330  If FRAME is omitted or nil, use the sele Line 1330  If FRAME is omitted or nil, use the sele
1330  ;; face implementation.  ;; face implementation.
1331    
1332  (defun face-attr-construct (face &optional frame)  (defun face-attr-construct (face &optional frame)
1333    "Return a defface-style attribute list for FACE on FRAME.    "Return a `defface'-style attribute list for FACE on FRAME.
1334  Value is a property list of pairs ATTRIBUTE VALUE for all specified  Value is a property list of pairs ATTRIBUTE VALUE for all specified
1335  face attributes of FACE where ATTRIBUTE is the attribute name and  face attributes of FACE where ATTRIBUTE is the attribute name and
1336  VALUE is the specified value of that attribute."  VALUE is the specified value of that attribute."
# Line 1835  created." Line 1835  created."
1835  ;; Update the colors of FACE, after FRAME's own colors have been  ;; Update the colors of FACE, after FRAME's own colors have been
1836  ;; changed.  ;; changed.
1837    
1838  (defalias 'frame-update-face-colors 'frame-set-background-mode)  (define-obsolete-function-alias 'frame-update-face-colors
1839  (make-obsolete 'frame-update-face-colors 'frame-set-background-mode "21.1")      'frame-set-background-mode "21.1")
1840    
1841    
1842  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
# Line 2055  Note: Other faces cannot inherit from th Line 2055  Note: Other faces cannot inherit from th
2055       ;; because in some cases the display engine will do it's own       ;; because in some cases the display engine will do it's own
2056       ;; workaround (to `dim' on ttys)       ;; workaround (to `dim' on ttys)
2057       :slant italic))       :slant italic))
2058    "Basic italic font."    "Basic italic face."
2059    :group 'basic-faces)    :group 'basic-faces)
2060    
2061    

Legend:
Removed from v.1.330  
changed lines
  Added in v.1.331

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26