auto upstream

8 files changed, 49 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5a902d6442..822a4a26870 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,17 @@
+2013-02-27  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of
+        &optional (bug#13819).
+
+2013-02-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-parse-device-names)
+        (tramp-adb-maybe-open-connection): Add timeouts.  (Bug#13299)
+
 2013-02-26  Michael Albinus  <michael.albinus@gmx.de>
 
-        * net/tramp-sh.el (tramp-sh-handle-insert-directory): Add
-        "2>/dev/null" to the ls command, in case "en_US.utf8" is not
+        * net/tramp-sh.el (tramp-sh-handle-insert-directory):
+        Add "2>/dev/null" to the ls command, in case "en_US.utf8" is not
         defined.  POSIX environments fall back to the "C" locale then and
         emit a warning, which shall be suppressed.
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index e5ce4db171b..9436012ee59 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2336,9 +2336,9 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
        ("`\\(\\(?:\\sw\\|\\s_\\)\\(?:\\sw\\|\\s_\\)+\\)'"
         (1 font-lock-constant-face prepend))
        ;; Constant values.
-       ("\\<:\\(?:\\sw\\|\\s_\\)+\\>" 0 font-lock-builtin-face)
+       ("\\_<:\\(?:\\sw\\|\\s_\\)+\\_>" 0 font-lock-builtin-face)
        ;; ELisp and CLisp `&' keywords as types.
-       ("\\<\\&\\(?:\\sw\\|\\s_\\)+\\>" . font-lock-type-face)
+       ("\\_<\\&\\(?:\\sw\\|\\s_\\)+\\_>" . font-lock-type-face)
        ;; ELisp regexp grouping constructs
        ((lambda (bound)
           (catch 'found
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 0974c62c56e..809623280bc 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -157,13 +157,14 @@ pass to the OPERATION."
 ;;;###tramp-autoload
 (defun tramp-adb-parse-device-names (ignore)
   "Return a list of (nil host) tuples allowed to access."
-  (with-temp-buffer
-    (when (zerop (call-process (tramp-adb-program) nil t nil "devices"))
-      (let (result)
-        (goto-char (point-min))
-        (while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
-          (add-to-list 'result (list nil (match-string 1))))
-        result))))
+  (with-timeout (10)
+    (with-temp-buffer
+      (when (zerop (call-process (tramp-adb-program) nil t nil "devices"))
+        (let (result)
+          (goto-char (point-min))
+          (while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
+            (add-to-list 'result (list nil (match-string 1))))
+          result)))))
 
 (defun tramp-adb-handle-expand-file-name (name &optional dir)
   "Like `expand-file-name' for Tramp files."
@@ -1106,7 +1107,7 @@ connection if a previous connection has died for some reason."
             (tramp-message
              vec 6 "%s" (mapconcat 'identity (process-command p) " "))
             ;; Wait for initial prompt.
-            (tramp-adb-wait-for-output p)
+            (tramp-adb-wait-for-output p 30)
             (unless (eq 'run (process-status p))
               (tramp-error  vec 'file-error "Terminated!"))
             (tramp-compat-set-process-query-on-exit-flag p nil)
diff --git a/src/ChangeLog b/src/ChangeLog
index 5e3112a26af..4135dadf28a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with
+        _SH_DENYRW flag, instead of emacs_open, to deny any other process
+        access to the lock file until it is written and closed.
+        (Bug#13807)
+
+2013-02-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * callint.c (Qcall_interactively):
+        * macros.c (Qexecute_kbd_macro):
+        Now static.
+
 2013-02-26  Bastien Guerry  <bzg@gnu.org>
 
         * window.c (Frecenter): Tiny docstring enhancement.
diff --git a/src/callint.c b/src/callint.c
index b0d4bcdd011..212dd2e3d62 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -29,7 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keymap.h"
 
 Lisp_Object Qminus, Qplus;
-Lisp_Object Qcall_interactively;
+static Lisp_Object Qcall_interactively;
 static Lisp_Object Qcommand_debug_status;
 static Lisp_Object Qenable_recursive_minibuffers;
 
diff --git a/src/filelock.c b/src/filelock.c
index 4d556de2454..78cd60a12e1 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -44,6 +44,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "coding.h"
 #include "systime.h"
 #ifdef WINDOWSNT
+#include <share.h>
 #include "w32.h"        /* for dostounix_filename */
 #endif
 
@@ -353,12 +354,17 @@ create_lock_file (char *lfname, char *lock_info_str, bool force)
      create a regular file with the lock info written as its
      contents.  */
   {
-    int fd = emacs_open (lfname, O_WRONLY | O_BINARY | O_CREAT | O_EXCL,
-                         S_IREAD | S_IWRITE);
+    /* Deny everybody else any kind of access to the file until we are
+       done writing it and close the handle.  This makes the entire
+       open/write/close operation atomic, as far as other processes
+       are concerned.  */
+    int fd = _sopen (lfname,
+                     _O_WRONLY | _O_BINARY | _O_CREAT | _O_EXCL | _O_NOINHERIT,
+                     _SH_DENYRW, S_IREAD | S_IWRITE);
 
     if (fd < 0 && errno == EEXIST && force)
-      fd = emacs_open (lfname, O_WRONLY | O_BINARY | O_TRUNC,
-                       S_IREAD | S_IWRITE);
+      fd = _sopen (lfname, _O_WRONLY | _O_BINARY | _O_TRUNC |_O_NOINHERIT,
+                   _SH_DENYRW, S_IREAD | S_IWRITE);
     if (fd >= 0)
       {
         ssize_t lock_info_len = strlen (lock_info_str);
diff --git a/src/lisp.h b/src/lisp.h
index 7b36878c0c5..3d018b2b45e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3371,7 +3371,7 @@ extern void syms_of_minibuf (void);
 
 extern Lisp_Object Qminus, Qplus;
 extern Lisp_Object Qwhen;
-extern Lisp_Object Qcall_interactively, Qmouse_leave_buffer_hook;
+extern Lisp_Object Qmouse_leave_buffer_hook;
 extern void syms_of_callint (void);
 
 /* Defined in casefiddle.c.  */
@@ -3532,7 +3532,6 @@ extern Lisp_Object exec_byte_code (Lisp_Object, Lisp_Object, Lisp_Object,
                                    Lisp_Object, ptrdiff_t, Lisp_Object *);
 
 /* Defined in macros.c.  */
-extern Lisp_Object Qexecute_kbd_macro;
 extern void init_macros (void);
 extern void syms_of_macros (void);
 
diff --git a/src/macros.c b/src/macros.c
index 0dcfbe5532c..48d23a977b1 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "window.h"
 #include "keyboard.h"
 
-Lisp_Object Qexecute_kbd_macro;
+static Lisp_Object Qexecute_kbd_macro;
 static Lisp_Object Qkbd_macro_termination_hook;
 
 /* Number of successful iterations so far