diff options
| author | Stefan Monnier | 2008-11-01 02:21:24 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-11-01 02:21:24 +0000 |
| commit | 793ffee82e6157cdcbd332c2fc51779ff34a15f9 (patch) | |
| tree | 9f8e9f7445dedbd09ec0d7983704894f75821dbb /src | |
| parent | a11d373796f896363dfb69fac5c38c32c031e866 (diff) | |
| download | emacs-793ffee82e6157cdcbd332c2fc51779ff34a15f9.tar.gz emacs-793ffee82e6157cdcbd332c2fc51779ff34a15f9.zip | |
(fill_gstring_header): Fix copy/paste typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/composite.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b9552eab25f..61827942c83 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-11-01 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * composite.c (fill_gstring_header): Fix copy/paste typo. | ||
| 4 | |||
| 1 | 2008-10-31 Martin Rudalics <rudalics@gmx.at> | 5 | 2008-10-31 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * window.c (Fnext_window, Fprevious_window): Rewrite doc-string. | 7 | * window.c (Fnext_window, Fprevious_window): Rewrite doc-string. |
diff --git a/src/composite.c b/src/composite.c index 9b3de0a615c..5f04c8ae8c6 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -810,7 +810,7 @@ fill_gstring_header (header, start, end, font_object, string) | |||
| 810 | else | 810 | else |
| 811 | { | 811 | { |
| 812 | CHECK_STRING (string); | 812 | CHECK_STRING (string); |
| 813 | if (! STRING_MULTIBYTE (current_buffer->enable_multibyte_characters)) | 813 | if (! STRING_MULTIBYTE (string)) |
| 814 | error ("Attempt to shape unibyte text"); | 814 | error ("Attempt to shape unibyte text"); |
| 815 | /* FROM and TO are checked by the caller. */ | 815 | /* FROM and TO are checked by the caller. */ |
| 816 | from = XINT (start); | 816 | from = XINT (start); |