diff options
| author | Juanma Barranquero | 2008-07-31 18:08:46 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-07-31 18:08:46 +0000 |
| commit | 12063bc56375326264397540e31ff3b151ec24d9 (patch) | |
| tree | 506cb186a7f23b7e5136d255ae78ecc8242c4442 /src | |
| parent | 83b5be731713a33c75ef78d99e95ece3de98a518 (diff) | |
| download | emacs-12063bc56375326264397540e31ff3b151ec24d9.tar.gz emacs-12063bc56375326264397540e31ff3b151ec24d9.zip | |
* keyboard.c (gobble_input): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 26 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bb9f3c600a9..911fd4a12c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-07-31 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * keyboard.c (gobble_input): Fix previous change. | ||
| 4 | |||
| 1 | 2008-07-31 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-07-31 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * bitmaps/README: | 7 | * bitmaps/README: |
| @@ -60,14 +64,14 @@ | |||
| 60 | 64 | ||
| 61 | 2008-07-30 Jason Rumney <jasonr@gnu.org> | 65 | 2008-07-30 Jason Rumney <jasonr@gnu.org> |
| 62 | 66 | ||
| 63 | * w32font.h (struct w32font_info): Use unicode version of textmetrics. | 67 | * w32font.h (struct w32font_info): Use unicode version of textmetrics. |
| 64 | 68 | ||
| 65 | * w32font.c (w32font_encode_char): Leave as unicode if in range. | 69 | * w32font.c (w32font_encode_char): Leave as unicode if in range. |
| 66 | (w32font_open_internal): Get unicode version of textmetrics. | 70 | (w32font_open_internal): Get unicode version of textmetrics. |
| 67 | Don't enable or disable glyph indices here. | 71 | Don't enable or disable glyph indices here. |
| 68 | (w32font_open): Disable use of glyph indices. | 72 | (w32font_open): Disable use of glyph indices. |
| 69 | 73 | ||
| 70 | * w32uniscribe.c (uniscribe_open): Enable use of glyph indices. | 74 | * w32uniscribe.c (uniscribe_open): Enable use of glyph indices. |
| 71 | 75 | ||
| 72 | 2008-07-30 Chong Yidong <cyd@stupidchicken.com> | 76 | 2008-07-30 Chong Yidong <cyd@stupidchicken.com> |
| 73 | 77 | ||
| @@ -90,14 +94,14 @@ | |||
| 90 | 94 | ||
| 91 | 2008-07-30 Jason Rumney <jasonr@gnu.org> | 95 | 2008-07-30 Jason Rumney <jasonr@gnu.org> |
| 92 | 96 | ||
| 93 | * w32uniscribe.c (uniscribe_encode_char): Fix glyph buffer size. | 97 | * w32uniscribe.c (uniscribe_encode_char): Fix glyph buffer size. |
| 94 | 98 | ||
| 95 | 2008-07-29 Jason Rumney <jasonr@gnu.org> | 99 | 2008-07-29 Jason Rumney <jasonr@gnu.org> |
| 96 | 100 | ||
| 97 | * w32uniscribe.c (uniscribe_shape): Avoid using context if cache | 101 | * w32uniscribe.c (uniscribe_shape): Avoid using context if cache |
| 98 | is populated. | 102 | is populated. |
| 99 | (uniscribe_encode_char): Always use uniscribe. | 103 | (uniscribe_encode_char): Always use uniscribe. |
| 100 | Avoid using context if cache is populated. | 104 | Avoid using context if cache is populated. |
| 101 | 105 | ||
| 102 | 2008-07-29 Jan Djärv <jan.h.d@swipnet.se> | 106 | 2008-07-29 Jan Djärv <jan.h.d@swipnet.se> |
| 103 | 107 | ||
diff --git a/src/keyboard.c b/src/keyboard.c index 51e228b37b0..ed95c3fce50 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -6923,8 +6923,8 @@ gobble_input (expected) | |||
| 6923 | } | 6923 | } |
| 6924 | else | 6924 | else |
| 6925 | #endif | 6925 | #endif |
| 6926 | read_avail_input (expected); | ||
| 6927 | #endif | 6926 | #endif |
| 6927 | read_avail_input (expected); | ||
| 6928 | } | 6928 | } |
| 6929 | 6929 | ||
| 6930 | /* Put a BUFFER_SWITCH_EVENT in the buffer | 6930 | /* Put a BUFFER_SWITCH_EVENT in the buffer |