Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-482
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-483
   Build-in-place tweak

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-484
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-228

5 files changed, 40 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b0c47862d4..248d5daa92e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keyboard.c: Declare Qdisabled_command_function instead of
+        Qdisabled_command_hook.
+        (Fcommand_execute): Use Qdisabled_command_function instead of
+        Qdisabled_command_hook.
+        (syms_of_keyboard): Ditto.
+
+2004-08-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keymap.c (Flocal_key_binding, Fglobal_key_binding)
+        (syms_of_keymap) <key-translation-map>: Doc fixes.
+
+2004-08-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (window_list_1): YAILOM.
+
+        * fileio.c (make_temp_name): Handle multibyte prefixes.
+
+2004-08-06  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keyboard.c (syms_of_keyboard) <overriding-terminal-local-map>:
+        Doc fix.
+
 2004-08-03  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (decode_coding_string): Adjust coding->consumed, and
diff --git a/src/fileio.c b/src/fileio.c
index a05d7689c12..180f6f94130 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -888,7 +888,7 @@ make_temp_name (prefix, base64_p)
      int base64_p;
 {
   Lisp_Object val;
-  int len;
+  int len, clen;
   int pid;
   unsigned char *p, *data;
   char pidbuf[20];
@@ -923,8 +923,10 @@ make_temp_name (prefix, base64_p)
 #endif
     }
 
-  len = SCHARS (prefix);
-  val = make_uninit_string (len + 3 + pidlen);
+  len = SBYTES (prefix); clen = SCHARS (prefix);
+  val = make_uninit_multibyte_string (clen + 3 + pidlen, len + 3 + pidlen);
+  if (!STRING_MULTIBYTE (prefix))
+    STRING_SET_UNIBYTE (val);
   data = SDATA (val);
   bcopy(SDATA (prefix), data, len);
   p = data + len;
diff --git a/src/keyboard.c b/src/keyboard.c
index c84e5d7bedc..d0b081e5cdd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -127,8 +127,8 @@ KBOARD the_only_kboard;
 #endif
 
 /* Non-nil disable property on a command means
-   do not execute it; call disabled-command-hook's value instead.  */
-Lisp_Object Qdisabled, Qdisabled_command_hook;
+   do not execute it; call disabled-command-function's value instead.  */
+Lisp_Object Qdisabled, Qdisabled_command_function;
 
 #define NUM_RECENT_KEYS (100)
 int recent_keys_index;  /* Index for storing next element into recent_keys */
@@ -9736,9 +9736,9 @@ a special event, so ignore the prefix argument and don't clear it.  */)
       tem = Fget (cmd, Qdisabled);
       if (!NILP (tem) && !NILP (Vrun_hooks))
         {
-          tem = Fsymbol_value (Qdisabled_command_hook);
+          tem = Fsymbol_value (Qdisabled_command_function);
           if (!NILP (tem))
-            return call1 (Vrun_hooks, Qdisabled_command_hook);
+            return call1 (Vrun_hooks, Qdisabled_command_function);
         }
     }
 
@@ -10916,8 +10916,8 @@ syms_of_keyboard ()
   Qtimer_event_handler = intern ("timer-event-handler");
   staticpro (&Qtimer_event_handler);
 
-  Qdisabled_command_hook = intern ("disabled-command-hook");
-  staticpro (&Qdisabled_command_hook);
+  Qdisabled_command_function = intern ("disabled-command-function");
+  staticpro (&Qdisabled_command_function);
 
   Qself_insert_command = intern ("self-insert-command");
   staticpro (&Qself_insert_command);
@@ -11414,6 +11414,7 @@ The elements of the list are event types that may have menu bar bindings.  */);
                  doc: /* Per-terminal keymap that overrides all other local keymaps.
 If this variable is non-nil, it is used as a keymap instead of the
 buffer's local map, and the minor mode keymaps and text property keymaps.
+It also overrides `overriding-local-map'.
 This variable is intended to let commands such as `universal-argument'
 set up a different keymap for reading the next command.  */);
 
diff --git a/src/keymap.c b/src/keymap.c
index ee4f41de6b8..e93a3f89fe4 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1603,7 +1603,7 @@ is non-nil, `key-binding' returns the unmapped command.  */)
 
 DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0,
        doc: /* Return the binding for command KEYS in current local keymap only.
-KEYS is a string, a sequence of keystrokes.
+KEYS is a string or vector, a sequence of keystrokes.
 The binding is probably a symbol with a function definition.
 
 If optional argument ACCEPT-DEFAULT is non-nil, recognize default
@@ -1622,7 +1622,7 @@ bindings; see the description of `lookup-key' for more details about this.  */)
 
 DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0,
        doc: /* Return the binding for command KEYS in current global keymap only.
-KEYS is a string, a sequence of keystrokes.
+KEYS is a string or vector, a sequence of keystrokes.
 The binding is probably a symbol with a function definition.
 This function's return values are the same as those of `lookup-key'
 \(which see).
@@ -3752,7 +3752,7 @@ key, typing `ESC O P x' would return [f1 x].  */);
   DEFVAR_LISP ("key-translation-map", &Vkey_translation_map,
                doc: /* Keymap of key translations that can override keymaps.
 This keymap works like `function-key-map', but comes after that,
-and applies even for keys that have ordinary bindings.  */);
+and its non-prefix bindings override ordinary bindings.  */);
   Vkey_translation_map = Qnil;
 
   staticpro (&Vmouse_events);
diff --git a/src/window.c b/src/window.c
index 4baf9d371bc..8a704bdc298 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1830,7 +1830,7 @@ window_list_1 (window, minibuf, all_frames)
   rest = Fmemq (window, list);
   if (!NILP (rest) && !EQ (rest, list))
     {
-      for (tail = list; XCDR (tail) != rest; tail = XCDR (tail))
+      for (tail = list; !EQ (XCDR (tail), rest); tail = XCDR (tail))
         ;
       XSETCDR (tail, Qnil);
       list = nconc2 (rest, list);