diff options
| author | Juanma Barranquero | 2007-10-15 00:23:32 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-15 00:23:32 +0000 |
| commit | decb374a426c8d095d144829791305d91a26b7b7 (patch) | |
| tree | 67b723646fa312f5568476c702b725e1a7232764 /src | |
| parent | ebfbc9505300eb288ffb84de140989078fd0642c (diff) | |
| download | emacs-decb374a426c8d095d144829791305d91a26b7b7.tar.gz emacs-decb374a426c8d095d144829791305d91a26b7b7.zip | |
(w32_font_is_double_byte, my_create_scrollbar): Make static.
(syms_of_w32term) <w32-enable-unicode-output>: Fix typo in docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32term.c | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bbbaa2b368c..4ba46df0f23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-14 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32term.c (w32_font_is_double_byte, my_create_scrollbar): Make static. | ||
| 4 | (syms_of_w32term) <w32-enable-unicode-output>: Fix typo in docstring. | ||
| 5 | |||
| 1 | 2007-10-14 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-10-14 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * buffer.c (Fmake_indirect_buffer): Set the buffer's tag. | 8 | * buffer.c (Fmake_indirect_buffer): Set the buffer's tag. |
diff --git a/src/w32term.c b/src/w32term.c index 6a1d1c20af3..a5189cd9c8d 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -1111,7 +1111,8 @@ w32_cache_char_metrics (font) | |||
| 1111 | 1111 | ||
| 1112 | 1112 | ||
| 1113 | /* Determine if a font is double byte. */ | 1113 | /* Determine if a font is double byte. */ |
| 1114 | int w32_font_is_double_byte (XFontStruct *font) | 1114 | static int |
| 1115 | w32_font_is_double_byte (XFontStruct *font) | ||
| 1115 | { | 1116 | { |
| 1116 | return font->double_byte_p; | 1117 | return font->double_byte_p; |
| 1117 | } | 1118 | } |
| @@ -3568,7 +3569,7 @@ w32_set_scroll_bar_thumb (bar, portion, position, whole) | |||
| 3568 | Scroll bars, general | 3569 | Scroll bars, general |
| 3569 | ************************************************************************/ | 3570 | ************************************************************************/ |
| 3570 | 3571 | ||
| 3571 | HWND | 3572 | static HWND |
| 3572 | my_create_scrollbar (f, bar) | 3573 | my_create_scrollbar (f, bar) |
| 3573 | struct frame * f; | 3574 | struct frame * f; |
| 3574 | struct scroll_bar * bar; | 3575 | struct scroll_bar * bar; |
| @@ -4182,7 +4183,7 @@ static short temp_buffer[100]; | |||
| 4182 | 4183 | ||
| 4183 | Some of these messages are reposted back to the message queue since the | 4184 | Some of these messages are reposted back to the message queue since the |
| 4184 | system calls the windows proc directly in a context where we cannot return | 4185 | system calls the windows proc directly in a context where we cannot return |
| 4185 | the data nor can we guarantee the state we are in. So if we dispatch them | 4186 | the data nor can we guarantee the state we are in. So if we dispatch them |
| 4186 | we will get into an infinite loop. To prevent this from ever happening we | 4187 | we will get into an infinite loop. To prevent this from ever happening we |
| 4187 | will set a variable to indicate we are in the read_socket call and indicate | 4188 | will set a variable to indicate we are in the read_socket call and indicate |
| 4188 | which message we are processing since the windows proc gets called | 4189 | which message we are processing since the windows proc gets called |
| @@ -6171,7 +6172,7 @@ w32_initialize_display_info (display_name) | |||
| 6171 | 6172 | ||
| 6172 | /* Create an xrdb-style database of resources to supercede registry settings. | 6173 | /* Create an xrdb-style database of resources to supercede registry settings. |
| 6173 | The database is just a concatenation of C strings, finished by an additional | 6174 | The database is just a concatenation of C strings, finished by an additional |
| 6174 | \0. The string are submitted to some basic normalization, so | 6175 | \0. The strings are submitted to some basic normalization, so |
| 6175 | 6176 | ||
| 6176 | [ *]option[ *]:[ *]value... | 6177 | [ *]option[ *]:[ *]value... |
| 6177 | 6178 | ||
| @@ -6635,7 +6636,7 @@ interpreted normally. */); | |||
| 6635 | Unicode output may prevent some third party applications for displaying | 6636 | Unicode output may prevent some third party applications for displaying |
| 6636 | Far-East Languages on Windows 95/98 from working properly. | 6637 | Far-East Languages on Windows 95/98 from working properly. |
| 6637 | NT uses Unicode internally anyway, so this flag will probably have no | 6638 | NT uses Unicode internally anyway, so this flag will probably have no |
| 6638 | affect on NT machines. */); | 6639 | effect on NT machines. */); |
| 6639 | w32_enable_unicode_output = 1; | 6640 | w32_enable_unicode_output = 1; |
| 6640 | 6641 | ||
| 6641 | DEFVAR_BOOL ("w32-use-visible-system-caret", | 6642 | DEFVAR_BOOL ("w32-use-visible-system-caret", |