summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2004-07-17 17:33:05 +0000
committerJuanma Barranquero <lekktu@gmail.com>2004-07-17 17:33:05 +0000
commit26503ad20330065c10629a61b79bcfa3bfb6fec3 (patch)
tree1e140d94b92cbe14ac43f62f0a2c61c641e8882f
parent07dfe73898a43069d9d85ef74978e3fc9509773a (diff)
downloademacs-26503ad20330065c10629a61b79bcfa3bfb6fec3.tar.gz
(not_single_kboard_state): Do nothing unless MULTI_KBOARD is defined.
-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 @@
+2004-07-17 Juanma Barranquero <lektu@terra.es>
+
+ * keyboard.c (not_single_kboard_state): Do nothing unless
+ MULTI_KBOARD is defined.
+
2004-07-17 Richard M. Stallman <rms@gnu.org>
* 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
not_single_kboard_state (kboard)
KBOARD *kboard;
{
+#ifdef MULTI_KBOARD
if (kboard == current_kboard)
single_kboard = 0;
+#endif
}
/* Maintain a stack of kboards, so other parts of Emacs
@@ -10203,7 +10205,7 @@ stuff_buffered_input (stuffstring)
/* Anything we have read ahead, put back for the shell to read. */
/* ?? What should this do when we have multiple keyboards??
Should we ignore anything that was typed in at the "wrong" kboard?
-
+
rms: we should stuff everything back into the kboard
it came from. */
for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)