Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org

7 files changed, 120 insertions, 20 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f40931cbabc..76117451b16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,52 @@
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_in_display_line_to): Don't record wrap position
+        if we are iterating over an object that generates glyphs for
+        marginal areas.  (Bug#17585)
+
+2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (safe__call1, safe__eval): Now static.
+
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (safe__call): Accept va_list argument instead of '...'.
+        (safe_call, safe__call1): Construct a va_list argument for safe_call.
+        (safe_call1): Call safe_call instead of safe__call directly.
+
+2014-05-26  Ken Brown  <kbrown@cornell.edu>
+
+        * w32term.c (x_delete_display) [CYGWIN]: Don't free
+        dpyinfo->w32_id_name, to make sure it doesn't get freed more than
+        once.  (Bug#17510)
+
+2014-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c: Bind inhibit-quit during pre-redisplay-function.
+        (safe__call, safe__call1, safe__eval): New functions.
+        (safe_call): Use it.
+        (prepare_menu_bars): Use it for pre-redisplay-function (bug#17577).
+        (display_mode_element): Same for `:eval'.
+
+2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix port to 32-bit AIX (Bug#17540).
+        * unexaix.c (copy_text_and_data): Don't add text_scnptr to ptr
+        twice.  _text already includes this offset.
+        (unrelocate_symbols): Don't cast 64-bit integer to pointer.
+
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_in_display_line_to): Avoid infinite recursion:
+        when closest_pos is identical to to_charpos, don't recurse, since
+        we already tried that, and failed.  (Bug#17539)
+
+        * w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: If we are
+        unwinding when frame's faces were not initialized yet, increment
+        the frame's image-cache reference count before calling
+        x_free_frame_resources.  Don't dereference
+        dpyinfo->terminal->image_cache if it is NULL.  (Bug#17524)
+
 2014-05-25  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsfont.m (nsfont_draw): Simplify as arguments are adjusted in
diff --git a/src/lisp.h b/src/lisp.h
index 40dd03c4fc4..2fd28359868 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1718,8 +1718,8 @@ struct Lisp_Hash_Table
      ratio, a float.  */
   Lisp_Object rehash_threshold;
 
-  /* Vector of hash codes.. If hash[I] is nil, this means that that
-     entry I is unused.  */
+  /* Vector of hash codes.  If hash[I] is nil, this means that the
+     I-th entry is unused.  */
   Lisp_Object hash;
 
   /* Vector used to chain entries.  If entry I is free, next[I] is the
diff --git a/src/minibuf.c b/src/minibuf.c
index 06fe0c07df6..3042b13b7d6 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -396,7 +396,8 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
      in previous recursive minibuffer, but was not set explicitly
      to t for this invocation, so set it to nil in this minibuffer.
      Save the old value now, before we change it.  */
-  specbind (intern ("minibuffer-completing-file-name"), Vminibuffer_completing_file_name);
+  specbind (intern ("minibuffer-completing-file-name"),
+            Vminibuffer_completing_file_name);
   if (EQ (Vminibuffer_completing_file_name, Qlambda))
     Vminibuffer_completing_file_name = Qnil;
 
diff --git a/src/unexaix.c b/src/unexaix.c
index c08d192b32c..c97d5cae2a8 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -379,7 +379,7 @@ copy_text_and_data (int new)
   char *ptr;
 
   lseek (new, text_scnptr, SEEK_SET);
-  ptr = _text + text_scnptr;
+  ptr = _text;
   end = ptr + f_ohdr.tsize;
   write_segment (new, ptr, end);
 
@@ -606,7 +606,7 @@ unrelocate_symbols (int new, int a_out,
               PERROR (a_name);
             }
 
-          p = (int *) (ldrel.l_vaddr + d_reloc);
+          p = (int *) (intptr_t) (ldrel.l_vaddr + d_reloc);
 
           switch (ldrel.l_symndx) {
           case SYMNDX_TEXT:
diff --git a/src/w32fns.c b/src/w32fns.c
index fa988583f33..c9a83c98234 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4244,6 +4244,17 @@ unwind_create_frame (Lisp_Object frame)
     {
 #ifdef GLYPH_DEBUG
       struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
+
+      /* If the frame's image cache refcount is still the same as our
+         private shadow variable, it means we are unwinding a frame
+         for which we didn't yet call init_frame_faces, where the
+         refcount is incremented.  Therefore, we increment it here, so
+         that free_frame_faces, called in x_free_frame_resources
+         below, will not mistakenly decrement the counter that was not
+         incremented yet to account for this new frame.  */
+      if (FRAME_IMAGE_CACHE (f) != NULL
+          && FRAME_IMAGE_CACHE (f)->refcount == image_cache_refcount)
+        FRAME_IMAGE_CACHE (f)->refcount++;
 #endif
 
       x_free_frame_resources (f);
@@ -4254,7 +4265,8 @@ unwind_create_frame (Lisp_Object frame)
       eassert (dpyinfo->reference_count == dpyinfo_refcount);
       eassert ((dpyinfo->terminal->image_cache == NULL
                 && image_cache_refcount == 0)
-               || dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
+               || (dpyinfo->terminal->image_cache != NULL
+                   && dpyinfo->terminal->image_cache->refcount == image_cache_refcount));
 #endif
       return Qt;
     }
diff --git a/src/w32term.c b/src/w32term.c
index aa65af4afd3..8ca023a86cb 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6419,7 +6419,11 @@ x_delete_display (struct w32_display_info *dpyinfo)
     if (dpyinfo->palette)
       DeleteObject (dpyinfo->palette);
   }
+  /* Avoid freeing dpyinfo->w32_id_name more than once if emacs is
+     running as a daemon; see bug#17510. */
+#ifndef CYGWIN
   xfree (dpyinfo->w32_id_name);
+#endif
 
   w32_reset_fringes ();
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index ab492d098d0..1585164f439 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2591,8 +2591,8 @@ safe_eval_handler (Lisp_Object arg, ptrdiff_t nargs, Lisp_Object *args)
    following.  Return the result, or nil if something went
    wrong.  Prevent redisplay during the evaluation.  */
 
-Lisp_Object
-safe_call (ptrdiff_t nargs, Lisp_Object func, ...)
+static Lisp_Object
+safe__call (bool inhibit_quit, ptrdiff_t nargs, Lisp_Object func, va_list ap)
 {
   Lisp_Object val;
 
@@ -2600,21 +2600,20 @@ safe_call (ptrdiff_t nargs, Lisp_Object func, ...)
     val = Qnil;
   else
     {
-      va_list ap;
       ptrdiff_t i;
       ptrdiff_t count = SPECPDL_INDEX ();
       struct gcpro gcpro1;
       Lisp_Object *args = alloca (nargs * word_size);
 
       args[0] = func;
-      va_start (ap, func);
       for (i = 1; i < nargs; i++)
         args[i] = va_arg (ap, Lisp_Object);
-      va_end (ap);
 
       GCPRO1 (args[0]);
       gcpro1.nvars = nargs;
       specbind (Qinhibit_redisplay, Qt);
+      if (inhibit_quit)
+        specbind (Qinhibit_quit, Qt);
       /* Use Qt to ensure debugger does not run,
          so there is no possibility of wanting to redisplay.  */
       val = internal_condition_case_n (Ffuncall, nargs, args, Qt,
@@ -2626,6 +2625,17 @@ safe_call (ptrdiff_t nargs, Lisp_Object func, ...)
   return val;
 }
 
+Lisp_Object
+safe_call (ptrdiff_t nargs, Lisp_Object func, ...)
+{
+  Lisp_Object retval;
+  va_list ap;
+
+  va_start (ap, func);
+  retval = safe__call (false, nargs, func, ap);
+  va_end (ap);
+  return retval;
+}
 
 /* Call function FN with one argument ARG.
    Return the result, or nil if something went wrong.  */
@@ -2636,12 +2646,30 @@ safe_call1 (Lisp_Object fn, Lisp_Object arg)
   return safe_call (2, fn, arg);
 }
 
+static Lisp_Object
+safe__call1 (bool inhibit_quit, Lisp_Object fn, ...)
+{
+  Lisp_Object retval;
+  va_list ap;
+
+  va_start (ap, fn);
+  retval = safe__call (inhibit_quit, 2, fn, ap);
+  va_end (ap);
+  return retval;
+}
+
 static Lisp_Object Qeval;
 
 Lisp_Object
 safe_eval (Lisp_Object sexpr)
 {
-  return safe_call1 (Qeval, sexpr);
+  return safe__call1 (false, Qeval, sexpr);
+}
+
+static Lisp_Object
+safe__eval (bool inhibit_quit, Lisp_Object sexpr)
+{
+  return safe__call1 (inhibit_quit, Qeval, sexpr);
 }
 
 /* Call function FN with two arguments ARG1 and ARG2.
@@ -8528,7 +8556,7 @@ move_it_in_display_line_to (struct it *it,
         }
       else
         {
-          if (it->line_wrap == WORD_WRAP)
+          if (it->line_wrap == WORD_WRAP && it->area == TEXT_AREA)
             {
               if (IT_DISPLAYING_WHITESPACE (it))
                 may_wrap = 1;
@@ -8812,8 +8840,11 @@ move_it_in_display_line_to (struct it *it,
                   if (closest_pos < ZV)
                     {
                       RESTORE_IT (it, &ppos_it, ppos_data);
-                      move_it_in_display_line_to (it, closest_pos, -1,
-                                                  MOVE_TO_POS);
+                      /* Don't recurse if closest_pos is equal to
+                         to_charpos, since we have just tried that.  */
+                      if (closest_pos != to_charpos)
+                        move_it_in_display_line_to (it, closest_pos, -1,
+                                                    MOVE_TO_POS);
                       result = MOVE_POS_MATCH_OR_ZV;
                     }
                   else
@@ -8874,8 +8905,9 @@ move_it_in_display_line_to (struct it *it,
                       && !at_eob_p && closest_pos < ZV)
                     {
                       RESTORE_IT (it, &ppos_it, ppos_data);
-                      move_it_in_display_line_to (it, closest_pos, -1,
-                                                  MOVE_TO_POS);
+                      if (closest_pos != to_charpos)
+                        move_it_in_display_line_to (it, closest_pos, -1,
+                                                    MOVE_TO_POS);
                     }
                   result = MOVE_POS_MATCH_OR_ZV;
                   break;
@@ -8893,7 +8925,9 @@ move_it_in_display_line_to (struct it *it,
               if (closest_pos < ZV)
                 {
                   RESTORE_IT (it, &ppos_it, ppos_data);
-                  move_it_in_display_line_to (it, closest_pos, -1, MOVE_TO_POS);
+                  if (closest_pos != to_charpos)
+                    move_it_in_display_line_to (it, closest_pos, -1,
+                                                MOVE_TO_POS);
                 }
               result = MOVE_POS_MATCH_OR_ZV;
               break;
@@ -11543,7 +11577,7 @@ prepare_menu_bars (void)
                 }
             }
         }
-      safe_call1 (Vpre_redisplay_function, windows);
+      safe__call1 (true, Vpre_redisplay_function, windows);
     }
 
   /* Update all frame titles based on their buffer names, etc.  We do
@@ -21857,7 +21891,7 @@ display_mode_element (struct it *it, int depth, int field_width, int precision,
             if (CONSP (XCDR (elt)))
               {
                 Lisp_Object spec;
-                spec = safe_eval (XCAR (XCDR (elt)));
+                spec = safe__eval (true, XCAR (XCDR (elt)));
                 n += display_mode_element (it, depth, field_width - n,
                                            precision - n, spec, props,
                                            risky);