diff options
| author | Juanma Barranquero | 2005-06-09 10:39:02 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-06-09 10:39:02 +0000 |
| commit | 9fed2905dd854ab0647b337973f1c543b93be1ff (patch) | |
| tree | 5632c193fe3803fc959ce9f676a3d5685ee891e6 /src | |
| parent | 9fa87e0dbcd5de07285151df20f10fd21bd5383f (diff) | |
| download | emacs-9fed2905dd854ab0647b337973f1c543b93be1ff.tar.gz emacs-9fed2905dd854ab0647b337973f1c543b93be1ff.zip | |
(Fdisplay_supports_face_attributes_p): Fix typo in docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d506df58cb..4c43422e660 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-06-09 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * xfaces.c (Fdisplay_supports_face_attributes_p): | ||
| 4 | Fix typo in docstring. | ||
| 5 | |||
| 1 | 2005-06-08 Steven Tamm <steventamm@mac.com> | 6 | 2005-06-08 Steven Tamm <steventamm@mac.com> |
| 2 | 7 | ||
| 3 | * unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section | 8 | * unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section |
| @@ -63,7 +68,7 @@ | |||
| 63 | * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode | 68 | * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode |
| 64 | non-static. | 69 | non-static. |
| 65 | 70 | ||
| 66 | * config.in: Added HAVE_CANCELMENUTRACKING | 71 | * config.in: Add HAVE_CANCELMENUTRACKING. |
| 67 | 72 | ||
| 68 | 2005-06-06 Eli Zaretskii <eliz@gnu.org> | 73 | 2005-06-06 Eli Zaretskii <eliz@gnu.org> |
| 69 | 74 | ||
| @@ -12994,9 +12999,9 @@ | |||
| 12994 | * sound.c: Added a partial implementation of play-sound-internal | 12999 | * sound.c: Added a partial implementation of play-sound-internal |
| 12995 | for Microsoft Windows. Added various #ifdef / #else / #endif | 13000 | for Microsoft Windows. Added various #ifdef / #else / #endif |
| 12996 | code blocks to separate the code that will compile under | 13001 | code blocks to separate the code that will compile under |
| 12997 | Microsoft Windows from the code that is specific to Gnu/Linux. | 13002 | Microsoft Windows from the code that is specific to GNU/Linux. |
| 12998 | Moved several blocks of code around to make this separation of code | 13003 | Moved several blocks of code around to make this separation of code |
| 12999 | into Windows compatible and Gnu/Linux compatible code blocks easier. | 13004 | into Windows compatible and GNU/Linux compatible code blocks easier. |
| 13000 | 13005 | ||
| 13001 | * makefile.w32-in: Include sound.c and link with WinMM.lib. | 13006 | * makefile.w32-in: Include sound.c and link with WinMM.lib. |
| 13002 | 13007 | ||
diff --git a/src/xfaces.c b/src/xfaces.c index 606a854980a..11e72ab7d05 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -6109,7 +6109,7 @@ DEFUN ("display-supports-face-attributes-p", | |||
| 6109 | 1, 2, 0, | 6109 | 1, 2, 0, |
| 6110 | doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported. | 6110 | doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported. |
| 6111 | The optional argument DISPLAY can be a display name, a frame, or | 6111 | The optional argument DISPLAY can be a display name, a frame, or |
| 6112 | nil (meaning the selected frame's display) | 6112 | nil (meaning the selected frame's display). |
| 6113 | 6113 | ||
| 6114 | The definition of `supported' is somewhat heuristic, but basically means | 6114 | The definition of `supported' is somewhat heuristic, but basically means |
| 6115 | that a face containing all the attributes in ATTRIBUTES, when merged | 6115 | that a face containing all the attributes in ATTRIBUTES, when merged |
| @@ -6122,7 +6122,7 @@ Point (2) implies that a `:weight black' attribute will be satisfied by | |||
| 6122 | any display that can display bold, and a `:foreground \"yellow\"' as long | 6122 | any display that can display bold, and a `:foreground \"yellow\"' as long |
| 6123 | as it can display a yellowish color, but `:slant italic' will _not_ be | 6123 | as it can display a yellowish color, but `:slant italic' will _not_ be |
| 6124 | satisfied by the tty display code's automatic substitution of a `dim' | 6124 | satisfied by the tty display code's automatic substitution of a `dim' |
| 6125 | face for italic. */) | 6125 | face for italic. */) |
| 6126 | (attributes, display) | 6126 | (attributes, display) |
| 6127 | Lisp_Object attributes, display; | 6127 | Lisp_Object attributes, display; |
| 6128 | { | 6128 | { |