diff options
| author | Juanma Barranquero | 2004-05-13 00:22:16 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2004-05-13 00:22:16 +0000 |
| commit | 7fc92635419abb02dab492b33c053d0cb65a85ce (patch) | |
| tree | 61a6e9daaa41808db1ba9acedf1775a1fe2f9de3 /src | |
| parent | 3b316424bf02d89d2f5018ca7a55db2897f0daf6 (diff) | |
| download | emacs-7fc92635419abb02dab492b33c053d0cb65a85ce.tar.gz emacs-7fc92635419abb02dab492b33c053d0cb65a85ce.zip | |
(Ftty_supports_face_attributes_p, Finternal_copy_lisp_face): Fix typo in
docstring.
(Finternal_get_lisp_face_attribute): Fix docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xfaces.c | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d850131af81..0293d66e27a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2004-05-13 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * xfaces.c (Ftty_supports_face_attributes_p) | ||
| 4 | (Finternal_copy_lisp_face): Fix typo in docstring. | ||
| 5 | (Finternal_get_lisp_face_attribute): Fix docstring. | ||
| 6 | |||
| 1 | 2004-05-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 7 | 2004-05-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * xfns.c (syms_of_xfns): Provide x-toolkit also for GTK. | 9 | * xfns.c (syms_of_xfns): Provide x-toolkit also for GTK. |
diff --git a/src/xfaces.c b/src/xfaces.c index 41a329041e7..ac44f3317ce 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -3857,7 +3857,7 @@ Otherwise check for the existence of a global face. */) | |||
| 3857 | DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | 3857 | DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, |
| 3858 | Sinternal_copy_lisp_face, 4, 4, 0, | 3858 | Sinternal_copy_lisp_face, 4, 4, 0, |
| 3859 | doc: /* Copy face FROM to TO. | 3859 | doc: /* Copy face FROM to TO. |
| 3860 | If FRAME it t, copy the global face definition of FROM to the | 3860 | If FRAME is t, copy the global face definition of FROM to the |
| 3861 | global face definition of TO. Otherwise, copy the frame-local | 3861 | global face definition of TO. Otherwise, copy the frame-local |
| 3862 | definition of FROM on FRAME to the frame-local definition of TO | 3862 | definition of FROM on FRAME to the frame-local definition of TO |
| 3863 | on NEW-FRAME, or FRAME if NEW-FRAME is nil. | 3863 | on NEW-FRAME, or FRAME if NEW-FRAME is nil. |
| @@ -4684,8 +4684,8 @@ DEFUN ("internal-get-lisp-face-attribute", Finternal_get_lisp_face_attribute, | |||
| 4684 | doc: /* Return face attribute KEYWORD of face SYMBOL. | 4684 | doc: /* Return face attribute KEYWORD of face SYMBOL. |
| 4685 | If SYMBOL does not name a valid Lisp face or KEYWORD isn't a valid | 4685 | If SYMBOL does not name a valid Lisp face or KEYWORD isn't a valid |
| 4686 | face attribute name, signal an error. | 4686 | face attribute name, signal an error. |
| 4687 | If the optional argument FRAME is given, report on face FACE in that | 4687 | If the optional argument FRAME is given, report on face SYMBOL in that |
| 4688 | frame. If FRAME is t, report on the defaults for face FACE (for new | 4688 | frame. If FRAME is t, report on the defaults for face SYMBOL (for new |
| 4689 | frames). If FRAME is omitted or nil, use the selected frame. */) | 4689 | frames). If FRAME is omitted or nil, use the selected frame. */) |
| 4690 | (symbol, keyword, frame) | 4690 | (symbol, keyword, frame) |
| 4691 | Lisp_Object symbol, keyword, frame; | 4691 | Lisp_Object symbol, keyword, frame; |
| @@ -5235,10 +5235,10 @@ with the default face for display, can be represented in a way that's | |||
| 5235 | \(1) different in appearance than the default face, and | 5235 | \(1) different in appearance than the default face, and |
| 5236 | \(2) `close in spirit' to what the attributes specify, if not exact. | 5236 | \(2) `close in spirit' to what the attributes specify, if not exact. |
| 5237 | 5237 | ||
| 5238 | Point (2) implies that a `:weight black' attribute will be satisified | 5238 | Point (2) implies that a `:weight black' attribute will be satisfied |
| 5239 | by any terminal that can display bold, and a `:foreground "yellow"' as | 5239 | by any terminal that can display bold, and a `:foreground "yellow"' as |
| 5240 | long as the terminal can display a yellowish color, but `:slant italic' | 5240 | long as the terminal can display a yellowish color, but `:slant italic' |
| 5241 | will _not_ be satisified by the tty display code's automatic | 5241 | will _not_ be satisfied by the tty display code's automatic |
| 5242 | substitution of a `dim' face for italic. */) | 5242 | substitution of a `dim' face for italic. */) |
| 5243 | (attributes, frame) | 5243 | (attributes, frame) |
| 5244 | Lisp_Object attributes, frame; | 5244 | Lisp_Object attributes, frame; |
| @@ -5446,8 +5446,8 @@ clear_face_gcs (c) | |||
| 5446 | } | 5446 | } |
| 5447 | 5447 | ||
| 5448 | 5448 | ||
| 5449 | /* Free all realized faces in face cache C, including basic faces. C | 5449 | /* Free all realized faces in face cache C, including basic faces. |
| 5450 | may be null. If faces are freed, make sure the frame's current | 5450 | C may be null. If faces are freed, make sure the frame's current |
| 5451 | matrix is marked invalid, so that a display caused by an expose | 5451 | matrix is marked invalid, so that a display caused by an expose |
| 5452 | event doesn't try to use faces we destroyed. */ | 5452 | event doesn't try to use faces we destroyed. */ |
| 5453 | 5453 | ||