aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2004-07-17 17:33:05 +0000
committerJuanma Barranquero2004-07-17 17:33:05 +0000
commit26503ad20330065c10629a61b79bcfa3bfb6fec3 (patch)
tree1e140d94b92cbe14ac43f62f0a2c61c641e8882f /src
parent07dfe73898a43069d9d85ef74978e3fc9509773a (diff)
downloademacs-26503ad20330065c10629a61b79bcfa3bfb6fec3.tar.gz
emacs-26503ad20330065c10629a61b79bcfa3bfb6fec3.zip
(not_single_kboard_state): Do nothing unless MULTI_KBOARD is defined.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 253b3ce806f..9765ec9403c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-07-17 Juanma Barranquero <lektu@terra.es>
2
3 * keyboard.c (not_single_kboard_state): Do nothing unless
4 MULTI_KBOARD is defined.
5
12004-07-17 Richard M. Stallman <rms@gnu.org> 62004-07-17 Richard M. Stallman <rms@gnu.org>
2 7
3 * window.c (coordinates_in_window): Inside the window but outside 8 * window.c (coordinates_in_window): Inside the window but outside
diff --git a/src/keyboard.c b/src/keyboard.c
index aa2bdbddf5a..de6356987b8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1096,8 +1096,10 @@ void
1096not_single_kboard_state (kboard) 1096not_single_kboard_state (kboard)
1097 KBOARD *kboard; 1097 KBOARD *kboard;
1098{ 1098{
1099#ifdef MULTI_KBOARD
1099 if (kboard == current_kboard) 1100 if (kboard == current_kboard)
1100 single_kboard = 0; 1101 single_kboard = 0;
1102#endif
1101} 1103}
1102 1104
1103/* Maintain a stack of kboards, so other parts of Emacs 1105/* Maintain a stack of kboards, so other parts of Emacs
@@ -10203,7 +10205,7 @@ stuff_buffered_input (stuffstring)
10203 /* Anything we have read ahead, put back for the shell to read. */ 10205 /* Anything we have read ahead, put back for the shell to read. */
10204 /* ?? What should this do when we have multiple keyboards?? 10206 /* ?? What should this do when we have multiple keyboards??
10205 Should we ignore anything that was typed in at the "wrong" kboard? 10207 Should we ignore anything that was typed in at the "wrong" kboard?
10206 10208
10207 rms: we should stuff everything back into the kboard 10209 rms: we should stuff everything back into the kboard
10208 it came from. */ 10210 it came from. */
10209 for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++) 10211 for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)