Merge from emacs-24

5 files changed, 53 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 82aabb389a3..27202f10bf5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2014-12-05  Lee Duhem  <lee.duhem@gmail.com>  (tiny change)
+
+        * eval.c (Fsignal): Remove duplicate test.
+        (Fautoload_do_load): Fix up docstring.
+
+2014-12-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (represented_filename, represented_frame): New variables.
+        (ns_set_represented_filename): New function.
+        (sendEvent:): Set represented filename here to avoid flicker,
+        related to Bug#18757.
+
+        * nsterm.h: Declare ns_set_represented_filename.
+
+        * nsfns.m (ns_set_name_as_filename): Don't set represented filename
+        at once, call ns_set_represented_filename instead.
+
+2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 
         * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.
diff --git a/src/eval.c b/src/eval.c
index 8a83fdb7880..8194468a650 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1533,8 +1533,7 @@ See also the function `condition-case'.  */)
           || NILP (clause)
           /* A `debug' symbol in the handler list disables the normal
              suppression of the debugger.  */
-          || (CONSP (clause) && CONSP (clause)
-              && !NILP (Fmemq (Qdebug, clause)))
+          || (CONSP (clause) && !NILP (Fmemq (Qdebug, clause)))
           /* Special handler that means "print a message and run debugger
              if requested".  */
           || EQ (h->tag_or_ch, Qerror)))
@@ -1918,7 +1917,7 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0,
 If non-nil, FUNNAME should be the symbol whose function value is FUNDEF,
 in which case the function returns the new autoloaded function value.
 If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if
-it is defines a macro.  */)
+it defines a macro.  */)
   (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only)
 {
   ptrdiff_t count = SPECPDL_INDEX ();
@@ -3405,7 +3404,6 @@ backtrace_eval_unrewind (int distance)
   for (; distance > 0; distance--)
     {
       tmp += step;
-      /*  */
       switch (tmp->kind)
         {
           /* FIXME: Ideally we'd like to "temporarily unwind" (some of) those
diff --git a/src/nsfns.m b/src/nsfns.m
index 4f158f4c51e..a5ff6346d74 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -619,18 +619,11 @@ ns_set_name_as_filename (struct frame *f)
 
           fstr = [NSString stringWithUTF8String: SSDATA (encoded_filename)];
           if (fstr == nil) fstr = @"";
-#ifdef NS_IMPL_COCOA
-          /* work around a bug observed on 10.3 and later where
-             setTitleWithRepresentedFilename does not clear out previous state
-             if given filename does not exist */
-          if (! [[NSFileManager defaultManager] fileExistsAtPath: fstr])
-            [[view window] setRepresentedFilename: @""];
-#endif
         }
       else
         fstr = @"";
 
-      [[view window] setRepresentedFilename: fstr];
+      ns_set_represented_filename (fstr, f);
       [[view window] setTitle: str];
       fset_name (f, name);
     }
diff --git a/src/nsterm.h b/src/nsterm.h
index b33e6b2ee08..c3841a40f59 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -890,11 +890,15 @@ extern unsigned long ns_get_rgb_color (struct frame *f,
 extern void ns_init_events ();
 extern void ns_finish_events ();
 
-/* From nsterm.m, needed in nsfont.m. */
 #ifdef __OBJC__
+/* From nsterm.m, needed in nsfont.m. */
 extern void
 ns_draw_text_decoration (struct glyph_string *s, struct face *face,
                          NSColor *defaultCol, CGFloat width, CGFloat x);
+/* Needed in nsfns.m.  */
+extern void
+ns_set_represented_filename (NSString* fstr, struct frame *f);
+
 #endif
 
 #ifdef NS_IMPL_GNUSTEP
diff --git a/src/nsterm.m b/src/nsterm.m
index 8729fa55a92..f012528b40d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -293,6 +293,9 @@ static struct {
   NULL, 0, 0
 };
 
+static NSString *represented_filename = nil;
+static struct frame *represented_frame = 0;
+
 #ifdef NS_IMPL_COCOA
 /*
  * State for pending menu activation:
@@ -400,6 +403,13 @@ void x_set_frame_alpha (struct frame *f);
    ========================================================================== */
 
 void
+ns_set_represented_filename (NSString* fstr, struct frame *f)
+{
+  represented_filename = [fstr retain];
+  represented_frame = f;
+}
+
+void
 ns_init_events (struct input_event* ev)
 {
   EVENT_INIT (*ev);
@@ -4600,6 +4610,23 @@ ns_term_shutdown (int sig)
     }
 #endif
 
+  if (represented_filename != nil && represented_frame)
+    {
+      NSString *fstr = represented_filename;
+      NSView *view = FRAME_NS_VIEW (represented_frame);
+#ifdef NS_IMPL_COCOA
+      /* work around a bug observed on 10.3 and later where
+         setTitleWithRepresentedFilename does not clear out previous state
+         if given filename does not exist */
+      if (! [[NSFileManager defaultManager] fileExistsAtPath: fstr])
+        [[view window] setRepresentedFilename: @""];
+#endif
+      [[view window] setRepresentedFilename: fstr];
+      [represented_filename release];
+      represented_filename = nil;
+      represented_frame = NULL;
+    }
+
   if (type == NSApplicationDefined)
     {
       switch ([theEvent data2])