Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

7 files changed, 260 insertions, 192 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f55e4ac786c..d5edca82fe9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,72 @@
+2007-12-14  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (w32_read_socket): Use MULTIBYTE_CHAR_KEYSTROKE_EVENT
+        for characters above 127.
+
+2007-12-13  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (w32_wnd_proc, Fw32_reconstruct_hot_key): Range check
+        before dereferencing array.
+        (lookup_vk_code): Remove zero comparison.
+
+2007-12-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (xd_retrieve_value, xd_retrieve_arg)
+        (Fdbus_call_method, Fdbus_send_signal, xd_read_message): Use
+        `unsigned int' instead of `uint'.
+        (xd_read_message, Fdbus_register_signal): Split expressions into
+        multiple lines before operators "&&" and "||", according to the
+        GNU Coding Standards.
+
+2007-12-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispextern.h (WINDOWS_NT): Fix incorrect spelling of WINDOWSNT.
+
+2007-12-12  Juri Linkov  <juri@jurta.org>
+
+        * buffer.c (Frename_buffer): In interactive spec replace
+        `read-buffer' with `read-string' that uses `buffer-name-history'
+        as history, and the current buffer's name as default.
+
+2007-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (Fcommand_execute): Call Qcall_interactively instead of
+        manipulating the backtrace manually.
+        (make_lispy_event): Merge the ASCII and MULTIBYTE cases.
+        (struct backtrace, backtrace_list): Remove.
+        (command_loop_1): Remove dead var `no_direct'.
+
+        * buffer.c (reset_buffer_local_variables): If permanent_too is 0, also
+        preserve non-built-in buffer-local variables.
+        (Fkill_all_local_variables): Don't re-create&re-set permanent
+        buffer-local variables.
+
+2007-12-09  Juri Linkov  <juri@jurta.org>
+
+        * buffer.c (Frename_buffer): Change interactive spec from "s" to
+        Lisp code that uses `read-buffer' with current buffer as default.
+
+2007-12-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (xd_read_message): Generate an event for every
+        registered handler.  There might be several handlers registered
+        for the same signal.
+        (Fdbus_register_signal): Don't overwrite a registration for the
+        same signal.  Add a new registration if handlers are different.
+        (Vdbus_registered_functions_table): Rework doc string.
+
+2007-12-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (Fdbus_get_unique_name, xd_read_message)
+        (Fdbus_register_signal): Use DBUS_MAXIMUM_NAME_LENGTH and
+        DBUS_MAXIMUM_MATCH_RULE_LENGTH for string lengths.
+        (Fdbus_call_method, Fdbus_send_signal, Fdbus_register_signal):
+        Unify argument lists.
+        (xd_read_message, Fdbus_register_signal) Reorder and extend event
+        arguments and hash table keys.  Use unique name for service.
+        (Fdbus_unregister_signal): Remove checks.
+        (Vdbus_registered_functions_table): Fix doc string.
+
 2007-12-05  Magnus Henoch  <mange@freemail.hu>
 
         * process.c (make_process): Initialize pty_flag to 0.
diff --git a/src/buffer.c b/src/buffer.c
index 77af23ace39..009d7de86fc 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -107,12 +107,14 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
 
 int last_per_buffer_idx;
 
-Lisp_Object Fset_buffer ();
-void set_buffer_internal ();
-void set_buffer_internal_1 ();
-static void call_overlay_mod_hooks ();
-static void swap_out_buffer_local_variables ();
-static void reset_buffer_local_variables ();
+EXFUN (Fset_buffer, 1);
+void set_buffer_internal P_ ((struct buffer *b));
+void set_buffer_internal_1 P_ ((struct buffer *b));
+static void call_overlay_mod_hooks P_ ((Lisp_Object list, Lisp_Object overlay,
+                                        int after, Lisp_Object arg1,
+                                        Lisp_Object arg2, Lisp_Object arg3));
+static void swap_out_buffer_local_variables P_ ((struct buffer *b));
+static void reset_buffer_local_variables P_ ((struct buffer *b, int permanent_too));
 
 /* Alist of all buffer names vs the buffers. */
 /* This used to be a variable, but is no longer,
@@ -717,7 +719,7 @@ reset_buffer (b)
    it does not treat permanent locals consistently.
    Instead, use Fkill_all_local_variables.
 
-   If PERMANENT_TOO is 1, then we reset permanent built-in
+   If PERMANENT_TOO is 1, then we reset permanent
    buffer-local variables.  If PERMANENT_TOO is 0,
    we preserve those.  */
 
@@ -755,7 +757,23 @@ reset_buffer_local_variables (b, permanent_too)
 #endif
 
   /* Reset all (or most) per-buffer variables to their defaults.  */
-  b->local_var_alist = Qnil;
+  if (permanent_too)
+    b->local_var_alist = Qnil;
+  else
+    {
+      Lisp_Object tmp, last = Qnil;
+      for (tmp = b->local_var_alist; CONSP (tmp); tmp = XCDR (tmp))
+        if (CONSP (XCAR (tmp))
+            && SYMBOLP (XCAR (XCAR (tmp)))
+            && !NILP (Fget (XCAR (XCAR (tmp)), Qpermanent_local)))
+          /* If permanent-local, keep it.  */
+          last = tmp;
+        else if (NILP (last))
+          b->local_var_alist = XCDR (tmp);
+        else
+          XSETCDR (last, XCDR (tmp));
+    }
+
   for (i = 0; i < last_per_buffer_idx; ++i)
     if (permanent_too || buffer_permanent_local_flags[i] == 0)
       SET_PER_BUFFER_VALUE_P (b, i, 0);
@@ -1170,7 +1188,9 @@ buffer as BUFFER.  */)
 }
 
 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2,
-       "sRename buffer (to new name): \nP",
+       "(list (read-string \"Rename buffer (to new name): \" \
+              nil 'buffer-name-history (buffer-name (current-buffer))) \
+              current-prefix-arg)",
        doc: /* Change current buffer's name to NEWNAME (a string).
 If second arg UNIQUE is nil or omitted, it is an error if a
 buffer named NEWNAME already exists.
@@ -2467,14 +2487,10 @@ The first thing this function does is run
 the normal hook `change-major-mode-hook'.  */)
      ()
 {
-  register Lisp_Object alist, sym, tem;
-  Lisp_Object oalist;
-
   if (!NILP (Vrun_hooks))
     call1 (Vrun_hooks, Qchange_major_mode_hook);
-  oalist = current_buffer->local_var_alist;
 
-  /* Make sure none of the bindings in oalist
+  /* Make sure none of the bindings in local_var_alist
      remain swapped in, in their symbols.  */
 
   swap_out_buffer_local_variables (current_buffer);
@@ -2483,20 +2499,6 @@ the normal hook `change-major-mode-hook'.  */)
 
   reset_buffer_local_variables (current_buffer, 0);
 
-  /* Any which are supposed to be permanent,
-     make local again, with the same values they had.  */
-
-  for (alist = oalist; CONSP (alist); alist = XCDR (alist))
-    {
-      sym = XCAR (XCAR (alist));
-      tem = Fget (sym, Qpermanent_local);
-      if (! NILP (tem))
-        {
-          Fmake_local_variable (sym);
-          Fset (sym, XCDR (XCAR (alist)));
-        }
-    }
-
   /* Force mode-line redisplay.  Useful here because all major mode
      commands call this function.  */
   update_mode_lines++;
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 07fc24243d7..0ccccc8b22d 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -112,7 +112,7 @@ Lisp_Object Vdbus_debug;
    message.  */
 char *
 xd_retrieve_value (dtype, object)
-     uint dtype;
+     unsigned int dtype;
      Lisp_Object object;
 {
 
@@ -146,7 +146,7 @@ xd_retrieve_value (dtype, object)
    partly supported; they result always in a Lisp list.  */
 Lisp_Object
 xd_retrieve_arg (dtype, iter)
-     uint dtype;
+     unsigned int dtype;
      DBusMessageIter *iter;
 {
 
@@ -241,7 +241,7 @@ DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name,
      Lisp_Object bus;
 {
   DBusConnection *connection;
-  char name[1024];
+  char name[DBUS_MAXIMUM_NAME_LENGTH];
 
   /* Check parameters.  */
   CHECK_SYMBOL (bus);
@@ -287,8 +287,8 @@ are converted into a list of Lisp objects which correspond to the
 elements of the D-Bus container.  Example:
 
 \(dbus-call-method
-  :session "GetKeyField" "org.gnome.seahorse"
-  "/org/gnome/seahorse/keys/openpgp" "org.gnome.seahorse.Keys"
+  :session "org.gnome.seahorse" "/org/gnome/seahorse/keys/openpgp"
+  "org.gnome.seahorse.Keys" "GetKeyField"
   "openpgp:657984B8C7A966DD" "simple-name")
 
   => (t ("Philip R. Zimmermann"))
@@ -297,18 +297,18 @@ If the result of the METHOD call is just one value, the converted Lisp
 object is returned instead of a list containing this single Lisp object.
 
 \(dbus-call-method
-  :system "GetPropertyString" "org.freedesktop.Hal"
-  "/org/freedesktop/Hal/devices/computer" "org.freedesktop.Hal.Device"
+  :system "org.freedesktop.Hal" "/org/freedesktop/Hal/devices/computer"
+  "org.freedesktop.Hal.Device" "GetPropertyString"
   "system.kernel.machine")
 
   => "i686"
 
-usage: (dbus-call-method BUS METHOD SERVICE PATH INTERFACE &rest ARGS)  */)
+usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &rest ARGS)  */)
      (nargs, args)
      int nargs;
      register Lisp_Object *args;
 {
-  Lisp_Object bus, method, service, path, interface;
+  Lisp_Object bus, service, path, interface, method;
   Lisp_Object result;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   DBusConnection *connection;
@@ -316,29 +316,29 @@ usage: (dbus-call-method BUS METHOD SERVICE PATH INTERFACE &rest ARGS)  */)
   DBusMessage *reply;
   DBusMessageIter iter;
   DBusError derror;
-  uint dtype;
+  unsigned int dtype;
   int i;
   char *value;
 
   /* Check parameters.  */
   bus = args[0];
-  method = args[1];
-  service = args[2];
-  path = args[3];
-  interface = args[4];
+  service = args[1];
+  path = args[2];
+  interface = args[3];
+  method = args[4];
 
   CHECK_SYMBOL (bus);
-  CHECK_STRING (method);
   CHECK_STRING (service);
   CHECK_STRING (path);
   CHECK_STRING (interface);
-  GCPRO5 (bus, method, service, path, interface);
+  CHECK_STRING (method);
+  GCPRO5 (bus, service, path, interface, method);
 
   XD_DEBUG_MESSAGE ("%s %s %s %s",
-                    SDATA (method),
                     SDATA (service),
                     SDATA (path),
-                    SDATA (interface));
+                    SDATA (interface),
+                    SDATA (method));
 
   /* Open a connection to the bus.  */
   connection = xd_initialize (bus);
@@ -447,40 +447,41 @@ Other Lisp objects are not supported as arguments of SIGNAL.
 Example:
 
 \(dbus-send-signal
-  :session "Started" "org.gnu.emacs" "/org/gnu/emacs" "org.gnu.emacs")))
+  :session "org.gnu.Emacs" "/org/gnu/Emacs"
+  "org.gnu.Emacs.FileManager" "FileModified" "/home/albinus/.emacs")
 
-usage: (dbus-send-signal BUS SIGNAL SERVICE PATH INTERFACE &rest ARGS)  */)
+usage: (dbus-send-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS)  */)
      (nargs, args)
      int nargs;
      register Lisp_Object *args;
 {
-  Lisp_Object bus, signal, service, path, interface;
+  Lisp_Object bus, service, path, interface, signal;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   DBusConnection *connection;
   DBusMessage *dmessage;
-  uint dtype;
+  unsigned int dtype;
   int i;
   char *value;
 
   /* Check parameters.  */
   bus = args[0];
-  signal = args[1];
-  service = args[2];
-  path = args[3];
-  interface = args[4];
+  service = args[1];
+  path = args[2];
+  interface = args[3];
+  signal = args[4];
 
   CHECK_SYMBOL (bus);
-  CHECK_STRING (signal);
   CHECK_STRING (service);
   CHECK_STRING (path);
   CHECK_STRING (interface);
-  GCPRO5 (bus, signal, service, path, interface);
+  CHECK_STRING (signal);
+  GCPRO5 (bus, service, path, interface, signal);
 
   XD_DEBUG_MESSAGE ("%s %s %s %s",
-                    SDATA (signal),
                     SDATA (service),
                     SDATA (path),
-                    SDATA (interface));
+                    SDATA (interface),
+                    SDATA (signal));
 
   /* Open a connection to the bus.  */
   connection = xd_initialize (bus);
@@ -542,14 +543,17 @@ Lisp_Object
 xd_read_message (bus)
      Lisp_Object bus;
 {
-  Lisp_Object key;
+  Lisp_Object args, key, value;
   struct gcpro gcpro1;
   static struct input_event event;
   DBusConnection *connection;
   DBusMessage *dmessage;
   DBusMessageIter iter;
-  uint dtype;
-  char service[1024], path[1024], interface[1024], member[1024];
+  unsigned int dtype;
+  char uname[DBUS_MAXIMUM_NAME_LENGTH];
+  char path[DBUS_MAXIMUM_MATCH_RULE_LENGTH]; /* Unlimited in D-Bus spec.  */
+  char interface[DBUS_MAXIMUM_NAME_LENGTH];
+  char member[DBUS_MAXIMUM_NAME_LENGTH];
 
   /* Open a connection to the bus.  */
   connection = xd_initialize (bus);
@@ -562,16 +566,11 @@ xd_read_message (bus)
   if (dmessage == NULL)
     return;
 
-  /* There is a message in the queue.  Construct the D-Bus event.  */
   XD_DEBUG_MESSAGE ("Event received");
-  EVENT_INIT (event);
-
-  event.kind = DBUS_EVENT;
-  event.frame_or_window = Qnil;
 
   /* Collect the parameters.  */
-  event.arg = Qnil;
-  GCPRO1 (event.arg);
+  args = Qnil;
+  GCPRO1 (args);
 
   if (!dbus_message_iter_init (dmessage, &iter))
     {
@@ -583,42 +582,61 @@ xd_read_message (bus)
   /* Loop over the resulting parameters.  Construct a list.  */
   while ((dtype = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID)
     {
-      event.arg = Fcons (xd_retrieve_arg (dtype, &iter), event.arg);
+      args = Fcons (xd_retrieve_arg (dtype, &iter), args);
       dbus_message_iter_next (&iter);
     }
 
   /* The arguments are stored in reverse order.  Reorder them.  */
-  event.arg = Fnreverse (event.arg);
+  args = Fnreverse (args);
 
-  /* Read service, object path interface and member from the
+  /* Read unique name, object path, interface and member from the
      message.  */
-  strcpy (service,   dbus_message_get_sender (dmessage));
+  strcpy (uname,     dbus_message_get_sender (dmessage));
   strcpy (path,      dbus_message_get_path (dmessage));
   strcpy (interface, dbus_message_get_interface (dmessage));
   strcpy (member,    dbus_message_get_member (dmessage));
 
-  /* Add them to the event.  */
-  event.arg = Fcons ((member == NULL ? Qnil : build_string (member)),
-                     event.arg);
-  event.arg = Fcons ((interface == NULL ? Qnil : build_string (interface)),
-                     event.arg);
-  event.arg = Fcons ((path == NULL ? Qnil : build_string (path)),
-                     event.arg);
-  event.arg = Fcons ((service == NULL ? Qnil : build_string (service)),
-                     event.arg);
-
-  /* Add the bus symbol to the event.  */
-  event.arg = Fcons (bus, event.arg);
-
-  /* Add the registered function of the message.  */
-  key = list3 (bus,
-               (interface == NULL ? Qnil : build_string (interface)),
-               (member == NULL ? Qnil : build_string (member)));
-  event.arg = Fcons (Fgethash (key, Vdbus_registered_functions_table, Qnil),
-                     event.arg);
-
-  /* Store it into the input event queue.  */
-  kbd_buffer_store_event (&event);
+  /* Search for a registered function of the message.  */
+  key = list3 (bus, build_string (interface), build_string (member));
+  value = Fgethash (key, Vdbus_registered_functions_table, Qnil);
+
+  /* Loop over the registered functions.  Construct an event.  */
+  while (!NILP (value))
+    {
+      key = XCAR (value);
+      /* key has the structure (SERVICE UNAME PATH HANDLER).  */
+      if (((uname == NULL)
+           || (NILP (XCAR (XCDR (key))))
+           || (strcmp (uname, SDATA (XCAR (XCDR (key)))) == 0))
+          && ((path == NULL)
+              || (NILP (XCAR (XCDR (XCDR (key)))))
+              || (strcmp (path, SDATA (XCAR (XCDR (XCDR (key))))) == 0))
+          && (!NILP (XCAR (XCDR (XCDR (XCDR (key)))))))
+        {
+          EVENT_INIT (event);
+          event.kind = DBUS_EVENT;
+          event.frame_or_window = Qnil;
+          event.arg = Fcons (XCAR (XCDR (XCDR (XCDR (key)))), args);
+
+          /* Add uname, path, interface and member to the event.  */
+          event.arg = Fcons ((member == NULL ? Qnil : build_string (member)),
+                             event.arg);
+          event.arg = Fcons ((interface == NULL
+                              ? Qnil : build_string (interface)),
+                             event.arg);
+          event.arg = Fcons ((path == NULL ? Qnil : build_string (path)),
+                             event.arg);
+          event.arg = Fcons ((uname == NULL ? Qnil : build_string (uname)),
+                             event.arg);
+
+          /* Add the bus symbol to the event.  */
+          event.arg = Fcons (bus, event.arg);
+
+          /* Store it into the input event queue.  */
+          kbd_buffer_store_event (&event);
+        }
+     value = XCDR (value);
+    }
 
   /* Cleanup.  */
   dbus_message_unref (dmessage);
@@ -666,31 +684,42 @@ SIGNAL and HANDLER must not be nil.  Example:
   (message "Device %s added" device))
 
 \(dbus-register-signal
-  :system "DeviceAdded"
-  (dbus-get-name-owner :system "org.freedesktop.Hal")
-  "/org/freedesktop/Hal/Manager" "org.freedesktop.Hal.Manager"
-  'my-signal-handler)
+  :system "org.freedesktop.Hal" "/org/freedesktop/Hal/Manager"
+  "org.freedesktop.Hal.Manager" "DeviceAdded" 'my-signal-handler)
 
-  => (:system "org.freedesktop.Hal.Manager" "DeviceAdded")
+  => (:system ":1.3" "/org/freedesktop/Hal/Manager"
+      "org.freedesktop.Hal.Manager" "DeviceAdded")
 
 `dbus-register-signal' returns an object, which can be used in
 `dbus-unregister-signal' for removing the registration.  */)
-     (bus, signal, service, path, interface, handler)
-     Lisp_Object bus, signal, service, path, interface, handler;
+     (bus, service, path, interface, signal, handler)
+     Lisp_Object bus, service, path, interface, signal, handler;
 {
-  Lisp_Object key;
+  Lisp_Object unique_name, key, value;
   DBusConnection *connection;
-  char rule[1024];
+  char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
   DBusError derror;
 
   /* Check parameters.  */
   CHECK_SYMBOL (bus);
-  CHECK_STRING (signal);
   if (!NILP (service)) CHECK_STRING (service);
   if (!NILP (path)) CHECK_STRING (path);
   CHECK_STRING (interface);
+  CHECK_STRING (signal);
   CHECK_SYMBOL (handler);
 
+  /* Retrieve unique name of service.  If service is a known name, we
+     will register for the corresponding unique name, if any.  Signals
+     are sent always with the unique name as sender.  Note: the unique
+     name of "org.freedesktop.DBus" is that string itself.  */
+  if ((!NILP (service))
+      && (strlen (SDATA (service)) > 0)
+      && (strcmp (SDATA (service), DBUS_SERVICE_DBUS) != 0)
+      && (strncmp (SDATA (service), ":", 1) != 0))
+    unique_name = call2 (intern ("dbus-get-name-owner"), bus, service);
+  else
+    unique_name = service;
+
   /* Open a connection to the bus.  */
   connection = xd_initialize (bus);
 
@@ -700,9 +729,9 @@ SIGNAL and HANDLER must not be nil.  Example:
            SDATA (interface),
            SDATA (signal));
 
-  /* Add service and path to the rule if they are non-nil.  */
-  if (!NILP (service))
-    sprintf (rule, "%s,sender='%s'%", rule, SDATA (service));
+  /* Add unique name and path to the rule if they are non-nil.  */
+  if (!NILP (unique_name))
+    sprintf (rule, "%s,sender='%s'%", rule, SDATA (unique_name));
 
   if (!NILP (path))
     sprintf (rule, "%s,path='%s'", rule, SDATA (path));
@@ -717,15 +746,21 @@ SIGNAL and HANDLER must not be nil.  Example:
 
   /* Create a hash table entry.  */
   key = list3 (bus, interface, signal);
-  Fputhash (key, handler, Vdbus_registered_functions_table);
-  XD_DEBUG_MESSAGE ("\"%s\" registered with handler \"%s\"",
-                    SDATA (format2 ("%s", key, Qnil)),
-                    SDATA (format2 ("%s", handler, Qnil)));
+  value = Fgethash (key, Vdbus_registered_functions_table, Qnil);
+
+  if (NILP (Fmember (list4 (service, unique_name, path, handler), value)))
+    Fputhash (key,
+              Fcons (list4 (service, unique_name, path, handler), value),
+              Vdbus_registered_functions_table);
 
   /* Return key.  */
   return key;
 }
 
+/* The current implementation removes ALL registered functions for a
+   given signal.  Shouldn't be a problem in general, but there might
+   be cases it is not desired.  Maybe we can refine the
+   implementation.  */
 DEFUN ("dbus-unregister-signal", Fdbus_unregister_signal, Sdbus_unregister_signal,
        1, 1, 0,
        doc: /* Unregister OBJECT from the D-Bus.
@@ -734,13 +769,6 @@ OBJECT must be the result of a preceding `dbus-register-signal' call.  */)
      Lisp_Object object;
 {
 
-  /* Check parameters.  */
-  CHECK_SYMBOL (object);
-
-  XD_DEBUG_MESSAGE ("\"%s\" unregistered with handler \"%s\"",
-                    SDATA (format2 ("%s", object, Qnil)),
-                    SDATA (format2 ("%s", Fsymbol_function (object), Qnil)));
-
   /* Unintern the signal symbol.  */
   Fremhash (object, Vdbus_registered_functions_table);
 
@@ -788,13 +816,19 @@ syms_of_dbusbind ()
 
   DEFVAR_LISP ("dbus-registered-functions-table", &Vdbus_registered_functions_table,
     doc: /* Hash table of registered functions for D-Bus.
-The key in the hash table is the list (BUS INTERFACE MEMBER).  BUS is
+The key in the hash table is the list (BUS MEMBER INTERFACE).  BUS is
 either the symbol `:system' or the symbol `:session'.  INTERFACE is a
 string which denotes a D-Bus interface, and MEMBER, also a string, is
-either a method or a signal INTERFACE is offering.
-
-The value in the hash table a the function to be called when a D-Bus
-message, which matches the key criteria, arrives.  */);
+either a method or a signal INTERFACE is offering.  All arguments but
+BUS must not be nil.
+
+The value in the hash table is a list of triple lists
+\((SERVICE UNAME PATH HANDLER) (SERVICE UNAME PATH HANDLER) ...).
+SERVICE is the service name as registered, UNAME is the corresponding
+unique name.  PATH is the object path of the sending object.  All of
+them be nil, which means a wildcard then.  HANDLER is the function to
+be called when a D-Bus message, which matches the key criteria,
+arrives.  */);
   /* We initialize Vdbus_registered_functions_table in dbus.el,
      because we need to define a hash table function first.  */
   Vdbus_registered_functions_table = Qnil;
diff --git a/src/dispextern.h b/src/dispextern.h
index a4021622ba1..b8027593721 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2785,7 +2785,7 @@ int draw_window_fringes P_ ((struct window *, int));
 int update_window_fringes P_ ((struct window *, int));
 void compute_fringe_widths P_ ((struct frame *, int));
 
-#ifdef WINDOWS_NT
+#ifdef WINDOWSNT
 void w32_init_fringe P_ ((struct redisplay_interface *));
 void w32_reset_fringes P_ ((void));
 #endif
diff --git a/src/keyboard.c b/src/keyboard.c
index 6595b7f800d..2230b339f5e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -108,21 +108,6 @@ int interrupt_input_pending;
 #define KBD_BUFFER_SIZE 4096
 #endif  /* No X-windows */
 
-/* Following definition copied from eval.c */
-
-struct backtrace
-  {
-    struct backtrace *next;
-    Lisp_Object *function;
-    Lisp_Object *args;  /* Points to vector of args. */
-    int nargs;          /* length of vector.  If nargs is UNEVALLED,
-                           args points to slot holding list of
-                           unevalled args */
-    char evalargs;
-    /* Nonzero means call value of debugger when done with this operation. */
-    char debug_on_exit;
-  };
-
 #ifdef MULTI_KBOARD
 KBOARD *initial_kboard;
 KBOARD *current_kboard;
@@ -175,8 +160,6 @@ extern int minbuf_level;
 
 extern int message_enable_multibyte;
 
-extern struct backtrace *backtrace_list;
-
 /* If non-nil, the function that implements the display of help.
    It's called with one argument, the help string to display.  */
 
@@ -1565,7 +1548,6 @@ command_loop_1 ()
   int nonundocount;
   Lisp_Object keybuf[30];
   int i;
-  int no_direct;
   int prev_modiff = 0;
   struct buffer *prev_buffer = NULL;
 #if 0 /* This shouldn't be necessary anymore.  --lorentey  */
@@ -1625,8 +1607,6 @@ command_loop_1 ()
       while (pending_malloc_warning)
         display_malloc_warning ();
 
-      no_direct = 0;
-
       Vdeactivate_mark = Qnil;
 
       /* If minibuffer on and echo area in use,
@@ -1787,7 +1767,7 @@ command_loop_1 ()
         }
       else
         {
-          if (NILP (current_kboard->Vprefix_arg) && ! no_direct)
+          if (NILP (current_kboard->Vprefix_arg))
             {
               /* In case we jump to directly_done.  */
               Vcurrent_prefix_arg = current_kboard->Vprefix_arg;
@@ -5558,41 +5538,32 @@ make_lispy_event (event)
     {
       /* A simple keystroke.  */
     case ASCII_KEYSTROKE_EVENT:
-      {
-        Lisp_Object lispy_c;
-        int c = event->code & 0377;
-        /* Turn ASCII characters into control characters
-           when proper.  */
-        if (event->modifiers & ctrl_modifier)
-          c = make_ctrl_char (c);
-
-        /* Add in the other modifier bits.  We took care of ctrl_modifier
-           just above, and the shift key was taken care of by the X code,
-           and applied to control characters by make_ctrl_char.  */
-        c |= (event->modifiers
-              & (meta_modifier | alt_modifier
-                 | hyper_modifier | super_modifier));
-        /* Distinguish Shift-SPC from SPC.  */
-        if ((event->code & 0377) == 040
-            && event->modifiers & shift_modifier)
-          c |= shift_modifier;
-        button_down_time = 0;
-        XSETFASTINT (lispy_c, c);
-        return lispy_c;
-      }
-
     case MULTIBYTE_CHAR_KEYSTROKE_EVENT:
       {
         Lisp_Object lispy_c;
         int c = event->code;
+        if (event->kind == ASCII_KEYSTROKE_EVENT)
+          {
+            c &= 0377;
+            eassert (c == event->code);
+            /* Turn ASCII characters into control characters
+               when proper.  */
+            if (event->modifiers & ctrl_modifier)
+              {
+                c = make_ctrl_char (c);
+                event->modifiers &= ~ctrl_modifier;
+              }
+          }
 
-        /* Add in the other modifier bits.  We took care of ctrl_modifier
-           just above, and the shift key was taken care of by the X code,
-           and applied to control characters by make_ctrl_char.  */
+        /* Add in the other modifier bits.  The shift key was taken care
+           of by the X code.  */
         c |= (event->modifiers
               & (meta_modifier | alt_modifier
                  | hyper_modifier | super_modifier | ctrl_modifier));
-        /* What about the `shift' modifier ?  */
+        /* Distinguish Shift-SPC from SPC.  */
+        if ((event->code) == 040
+            && event->modifiers & shift_modifier)
+          c |= shift_modifier;
         button_down_time = 0;
         XSETFASTINT (lispy_c, c);
         return lispy_c;
@@ -9619,7 +9590,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
             }
 
           GROW_RAW_KEYBUF;
-          XVECTOR (raw_keybuf)->contents[raw_keybuf_count++] = key;
+          ASET (raw_keybuf, raw_keybuf_count++, key);
         }
 
       /* Clicks in non-text areas get prefixed by the symbol
@@ -10401,7 +10372,6 @@ a special event, so ignore the prefix argument and don't clear it.  */)
   register Lisp_Object final;
   register Lisp_Object tem;
   Lisp_Object prefixarg;
-  struct backtrace backtrace;
   extern int debug_on_next_call;
 
   debug_on_next_call = 0;
@@ -10467,20 +10437,11 @@ a special event, so ignore the prefix argument and don't clear it.  */)
     }
 
   if (CONSP (final) || SUBRP (final) || COMPILEDP (final))
-    {
-      backtrace.next = backtrace_list;
-      backtrace_list = &backtrace;
-      backtrace.function = &Qcall_interactively;
-      backtrace.args = &cmd;
-      backtrace.nargs = 1;
-      backtrace.evalargs = 0;
-      backtrace.debug_on_exit = 0;
-
-      tem = Fcall_interactively (cmd, record_flag, keys);
+    /* Don't call Fcall_interactively directly because we want to make
+       sure the backtrace has an entry for `call-interactively'.
+       For the same reason, pass `cmd' rather than `final'.  */
+      return call3 (Qcall_interactively, cmd, record_flag, keys);
 
-      backtrace_list = backtrace.next;
-      return tem;
-    }
   return Qnil;
 }
 
@@ -10591,7 +10552,7 @@ give to the command you invoke, if it asks for an argument.  */)
     bindings = Qnil;
 
   value = Qnil;
-  GCPRO2 (bindings, value);
+  GCPRO3 (bindings, value, function);
   value = Fcommand_execute (function, Qt, Qnil, Qnil);
 
   /* If the command has a key binding, print it now.  */
diff --git a/src/w32fns.c b/src/w32fns.c
index 441ad0f60dc..8ddf8d0f74d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2971,7 +2971,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
              they don't produce WM_CHAR messages).  This ensures that
              indicator lights are toggled promptly on Windows 9x, for
              example.  */
-          if (lispy_function_keys[wParam] != 0)
+          if (wParam < 256 && lispy_function_keys[wParam])
             {
               windows_translate = 1;
               goto translate;
@@ -3093,7 +3093,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
           break;
         default:
           /* If not defined as a function key, change it to a WM_CHAR message. */
-          if (lispy_function_keys[wParam] == 0)
+          if (wParam > 255 || !lispy_function_keys[wParam])
             {
               DWORD modifiers = construct_console_modifiers ();
 
@@ -8366,7 +8366,7 @@ lookup_vk_code (char *key)
   int i;
 
   for (i = 0; i < 256; i++)
-    if (lispy_function_keys[i] != 0
+    if (lispy_function_keys[i]
         && strcmp (lispy_function_keys[i], key) == 0)
       return i;
 
@@ -8544,7 +8544,7 @@ usage: (w32-reconstruct-hot-key ID)  */)
   vk_code = HOTKEY_VK_CODE (hotkeyid);
   w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);
 
-  if (lispy_function_keys[vk_code])
+  if (vk_code < 256 && lispy_function_keys[vk_code])
     key = intern (lispy_function_keys[vk_code]);
   else
     key = make_number (vk_code);
diff --git a/src/w32term.c b/src/w32term.c
index 75714a4a118..b489657361c 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4625,6 +4625,8 @@ x_scroll_bar_clear (f)
 static int temp_index;
 static short temp_buffer[100];
 
+/* Temporarily store lead byte of DBCS input sequences.  */
+static char dbcs_lead = 0;
 
 /* Read events coming from the W32 shell.
    This routine is called by the SIGIO handler.