Merge from emacs-24; up to 117687

6 files changed, 58 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f8ed3b36dde..e3f34e27dfc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2014-11-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (run): Only use non-system event loop if OSX version is
+        exactly 10.9 (Bug#18993).
+
+2014-11-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * callproc.c (encode_current_directory): Support handling of file
+        names prepended by "/:".  (Bug#18891)
+
+2014-11-08  Alan Mackenzie  <acm@muc.de>
+
+        * syntax.c (back_comment): Fix off-by-one error (bug#18022).
+
+2014-11-08  Dima Kogan  <dima@secretsauce.net>
+
+        * xgselect.c (xg_select): Use g_main_context_acquire (bug#18861).
+
+2014-11-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name
+        raises an error.  (Bug#18891)
+
 2014-11-08  Martin Rudalics  <rudalics@gmx.at>
 
         * frame.c (adjust_frame_size): Call x_set_window_size only if
diff --git a/src/callproc.c b/src/callproc.c
index e3dcc7bbcca..24b88551851 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -127,6 +127,14 @@ encode_current_directory (void)
 
   dir = expand_and_dir_to_file (dir, Qnil);
 
+  if (NILP (Ffile_accessible_directory_p (dir)))
+    report_file_error ("Setting current directory",
+                       BVAR (current_buffer, directory));
+
+  /* Remove "/:" from dir.  */
+  if (! NILP (Fstring_match (build_string ("^/:"), dir, Qnil)))
+    dir = Fsubstring (dir, make_number (2), Qnil);
+
   if (STRING_MULTIBYTE (dir))
     dir = ENCODE_FILE (dir);
   if (! file_accessible_directory_p (dir))
diff --git a/src/dired.c b/src/dired.c
index ba6a61a2f5b..8afba247e61 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -909,7 +909,10 @@ so last access time will always be midnight of that day.  */)
   Lisp_Object encoded;
   Lisp_Object handler;
 
-  filename = Fexpand_file_name (filename, Qnil);
+  filename = internal_condition_case_2 (Fexpand_file_name, filename, Qnil,
+                                        Qt, Fidentity);
+  if (!STRINGP (filename))
+    return Qnil;
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
diff --git a/src/nsterm.m b/src/nsterm.m
index c8ad50ef339..216678357e7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4501,15 +4501,15 @@ ns_term_shutdown (int sig)
 #ifdef NS_IMPL_COCOA
 - (void)run
 {
-#ifndef NSAppKitVersionNumber10_8
-#define NSAppKitVersionNumber10_8 1187
+#ifndef NSAppKitVersionNumber10_9
+#define NSAppKitVersionNumber10_9 1265
 #endif
 
-  if (NSAppKitVersionNumber <= NSAppKitVersionNumber10_8)
-    {
-      [super run];
-      return;
-    }
+    if ((int)NSAppKitVersionNumber != NSAppKitVersionNumber10_9)
+      {
+        [super run];
+        return;
+      }
 
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
diff --git a/src/syntax.c b/src/syntax.c
index 9f5ef754e2a..dc84ca69fb7 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -825,7 +825,7 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop,
     {
       from = comment_end;
       from_byte = comment_end_byte;
-      UPDATE_SYNTAX_TABLE_FORWARD (comment_end - 1);
+      UPDATE_SYNTAX_TABLE_FORWARD (comment_end);
     }
   /* If comstart_pos is set and we get here (ie. didn't jump to `lossage'
      or `done'), then we've found the beginning of the non-nested comment.  */
diff --git a/src/xgselect.c b/src/xgselect.c
index bf889a90e97..4e2d1c8db69 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -55,19 +55,28 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds,
   GPollFD *gfds = gfds_buf;
   int gfds_size = ARRAYELTS (gfds_buf);
   int n_gfds, retval = 0, our_fds = 0, max_fds = fds_lim - 1;
-  int i, nfds, tmo_in_millisec;
+  bool context_acquired = false;
+  int i, nfds, tmo_in_millisec = -1;
   bool need_to_dispatch;
   USE_SAFE_ALLOCA;
 
   context = g_main_context_default ();
+  context_acquired = g_main_context_acquire (context);
+  /* FIXME: If we couldn't acquire the context, we just silently proceed
+     because this function handles more than just glib file descriptors.
+     Note that, as implemented, this failure is completely silent: there is
+     no feedback to the caller.  */
 
   if (rfds) all_rfds = *rfds;
   else FD_ZERO (&all_rfds);
   if (wfds) all_wfds = *wfds;
   else FD_ZERO (&all_wfds);
 
-  n_gfds = g_main_context_query (context, G_PRIORITY_LOW, &tmo_in_millisec,
-                                 gfds, gfds_size);
+  n_gfds = (context_acquired
+            ? g_main_context_query (context, G_PRIORITY_LOW, &tmo_in_millisec,
+                                    gfds, gfds_size)
+            : -1);
+
   if (gfds_size < n_gfds)
     {
       SAFE_NALLOCA (gfds, sizeof *gfds, n_gfds);
@@ -152,6 +161,9 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds,
       errno = pselect_errno;
     }
 
+  if (context_acquired)
+    g_main_context_release (context);
+
   /* To not have to recalculate timeout, return like this.  */
   if ((our_fds > 0 || (nfds == 0 && tmop == &tmo)) && (retval == 0))
     {