5 files changed, 51 insertions, 29 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 818ff2784be..1e8684c4ddb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2013-12-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fw32_shell_execute): Make DOCUMENT absolute only if it
+        is a file name.  (Bug#16252)
+
+2013-12-25  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (Voverriding_terminal_local_map):
+        (Voverriding_local_map): Doc fix.
+
+        * keymap.c (Vemulation_mode_map_alists): Doc fix.
+
+2013-12-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fw32_shell_execute): Ensure DOCUMENT is an absolute
+        file name when it is submitted to ShellExecute.  Simplify code.
+        Don't test DOCUMENT for being a string, as that is enforced by
+        CHECK_STRING.  Doc fix.
+
 2013-12-23  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (tool_bar_height): Use WINDOW_PIXEL_WIDTH to set up the
diff --git a/src/intervals.c b/src/intervals.c
index 0e3b684f570..f2a2a16f4ad 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -676,6 +676,7 @@ find_interval (register INTERVAL tree, register ptrdiff_t position)
 
   while (1)
     {
+      eassert (tree);
       if (relative_position < LEFT_TOTAL_LENGTH (tree))
         {
           tree = tree->left;
diff --git a/src/keyboard.c b/src/keyboard.c
index 915ce9dcf23..8ccbf77871c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11415,18 +11415,19 @@ tool-bar separators natively.  Otherwise it is unused (e.g. on GTK).  */);
   DEFVAR_KBOARD ("overriding-terminal-local-map",
                  Voverriding_terminal_local_map,
                  doc: /* Per-terminal keymap that takes precedence over all other keymaps.
-
 This variable is intended to let commands such as `universal-argument'
 set up a different keymap for reading the next command.
 
 `overriding-terminal-local-map' has a separate binding for each
-terminal device.
-See Info node `(elisp)Multiple Terminals'.  */);
+terminal device.  See Info node `(elisp)Multiple Terminals'.  */);
 
   DEFVAR_LISP ("overriding-local-map", Voverriding_local_map,
-               doc: /* Keymap that overrides almost all other local keymaps.
-If this variable is non-nil, it is used as a keymap--replacing the
-buffer's local map, the minor mode keymaps, and char property keymaps.  */);
+               doc: /* Keymap that replaces (overrides) local keymaps.
+If this variable is non-nil, Emacs looks up key bindings in this
+keymap INSTEAD OF the keymap char property, minor mode maps, and the
+buffer's local map.  Hence, the only active keymaps would be
+`overriding-terminal-local-map', this keymap, and `global-keymap', in
+order of precedence.  */);
   Voverriding_local_map = Qnil;
 
   DEFVAR_LISP ("overriding-local-map-menu-flag", Voverriding_local_map_menu_flag,
diff --git a/src/keymap.c b/src/keymap.c
index 562787ee8a5..9ef5a0b294f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3753,7 +3753,7 @@ it is provided for major modes to bind locally.  */);
   Vminor_mode_overriding_map_alist = Qnil;
 
   DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists,
-               doc: /* List of keymap alists to use for emulations modes.
+               doc: /* List of keymap alists to use for emulation modes.
 It is intended for modes or packages using multiple minor-mode keymaps.
 Each element is a keymap alist just like `minor-mode-map-alist', or a
 symbol with a variable binding which is a keymap alist, and it is used
diff --git a/src/w32fns.c b/src/w32fns.c
index 59526936afe..02850d8954d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6844,12 +6844,15 @@ operations:
                specified DOCUMENT
  \"find\"    - initiate search starting from DOCUMENT which must specify
                a directory
+ \"runas\"   - run DOCUMENT, which must be an excutable file, with
+               elevated privileges (a.k.a. \"as Administrator\").
  nil       - invoke the default OPERATION, or \"open\" if default is
                not defined or unavailable
 
 DOCUMENT is typically the name of a document file or a URL, but can
 also be a program executable to run, or a directory to open in the
-Windows Explorer.
+Windows Explorer.  If it is a file, it must be a local one; this
+function does not support remote file names.
 
 If DOCUMENT is a program executable, the optional third arg PARAMETERS
 can be a string containing command line parameters that will be passed
@@ -6873,22 +6876,19 @@ an integer representing a ShowWindow flag:
 #ifndef CYGWIN
   int use_unicode = w32_unicode_filenames;
   char *doc_a = NULL, *params_a = NULL, *ops_a = NULL;
+  Lisp_Object absdoc;
 #endif
 
   CHECK_STRING (document);
 
 #ifdef CYGWIN
   current_dir = Fcygwin_convert_file_name_to_windows (current_dir, Qt);
-  if (STRINGP (document))
-    document = Fcygwin_convert_file_name_to_windows (document, Qt);
+  document = Fcygwin_convert_file_name_to_windows (document, Qt);
 
   /* Encode filename, current directory and parameters.  */
   current_dir = GUI_ENCODE_FILE (current_dir);
-  if (STRINGP (document))
-    {
-      document = GUI_ENCODE_FILE (document);
-      doc_w = GUI_SDATA (document);
-    }
+  document = GUI_ENCODE_FILE (document);
+  doc_w = GUI_SDATA (document);
   if (STRINGP (parameters))
     {
       parameters = GUI_ENCODE_SYSTEM (parameters);
@@ -6904,20 +6904,26 @@ an integer representing a ShowWindow flag:
                                      (INTEGERP (show_flag)
                                       ? XINT (show_flag) : SW_SHOWDEFAULT));
 #else  /* !CYGWIN */
+  current_dir = ENCODE_FILE (current_dir);
+  /* We have a situation here.  If DOCUMENT is a relative file name,
+     and is not in CURRENT_DIR, ShellExecute below will fail to find
+     it.  So we need to make the file name absolute.  But DOCUMENT
+     does not have to be a file, it can be a URL, for example.  So we
+     make it absolute only if it is an existing file; if it is a file
+     that does not exist, tough.  */
+  absdoc = Fexpand_file_name (document, Qnil);
+  if (!NILP (Ffile_exists_p (absdoc)))
+    document = absdoc;
+  document = ENCODE_FILE (document);
   if (use_unicode)
     {
       wchar_t document_w[MAX_PATH], current_dir_w[MAX_PATH];
 
       /* Encode filename, current directory and parameters, and
          convert operation to UTF-16.  */
-      current_dir = ENCODE_FILE (current_dir);
       filename_to_utf16 (SSDATA (current_dir), current_dir_w);
-      if (STRINGP (document))
-        {
-          document = ENCODE_FILE (document);
-          filename_to_utf16 (SSDATA (document), document_w);
-          doc_w = document_w;
-        }
+      filename_to_utf16 (SSDATA (document), document_w);
+      doc_w = document_w;
       if (STRINGP (parameters))
         {
           int len;
@@ -6954,14 +6960,9 @@ an integer representing a ShowWindow flag:
     {
       char document_a[MAX_PATH], current_dir_a[MAX_PATH];
 
-      current_dir = ENCODE_FILE (current_dir);
       filename_to_ansi (SSDATA (current_dir), current_dir_a);
-      if (STRINGP (document))
-        {
-          ENCODE_FILE (document);
-          filename_to_ansi (SSDATA (document), document_a);
-          doc_a = document_a;
-        }
+      filename_to_ansi (SSDATA (document), document_a);
+      doc_a = document_a;
       if (STRINGP (parameters))
         {
           parameters = ENCODE_SYSTEM (parameters);