Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantipov@yandex.ru

5 files changed, 39 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fbe5f597d9c..cfafd9d8fa3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2014-09-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in
+        the reported row in the case of a window with a header line, by
+        improving on the fix committed in 2011-10-08T10:58:50Z!eliz@gnu.org
+        eliz@gnu.org-20111008105850-ht4tvsayohvr1kjc.  (Bug#18384)
+
+2014-09-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * eval.c (internal_lisp_condition_case): Don't overrun the stack
+        when configured --with-wide-int on typical 32-bit platforms.
+
+2014-09-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_and_set_cursor): Call erase_phys_cursor also
+        when HPOS is negative, for the benefit of R2L glyph rows whose
+        newline overflows into the fringe.
+
+2014-09-03  Ken Brown  <kbrown@cornell.edu>
+
+        * conf_post.h (strnicmp) [CYGWIN && HAVE_NTGUI]: Define.  (Bug#18366)
+
 2014-09-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Minor cleanup of recent strlen-avoiding patch.
diff --git a/src/conf_post.h b/src/conf_post.h
index 35d9e6d1385..8667e2554cd 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -193,6 +193,10 @@ extern void _DebPrint (const char *fmt, ...);
 #if defined CYGWIN && defined HAVE_NTGUI
 # define NTGUI_UNICODE /* Cygwin runs only on UNICODE-supporting systems */
 # define _WIN32_WINNT 0x500 /* Win2k */
+/* The following was in /usr/include/string.h prior to Cygwin 1.7.33.  */
+#ifndef strnicmp
+#define strnicmp strncasecmp
+#endif
 #endif
 
 #ifdef emacs /* Don't do this for lib-src.  */
diff --git a/src/dispnew.c b/src/dispnew.c
index 43ffca7c181..73b6253e124 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5121,7 +5121,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
 #ifdef HAVE_WINDOW_SYSTEM
   struct image *img = 0;
 #endif
-  int x0, x1, to_x;
+  int x0, x1, to_x, it_vpos;
   void *itdata = NULL;
 
   /* We used to set current_buffer directly here, but that does the
@@ -5130,11 +5130,6 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
   itdata = bidi_shelve_cache ();
   CLIP_TEXT_POS_FROM_MARKER (startp, w->start);
   start_display (&it, w, startp);
-  /* start_display takes into account the header-line row, but IT's
-     vpos still counts from the glyph row that includes the window's
-     start position.  Adjust for a possible header-line row.  */
-  it.vpos += WINDOW_WANTS_HEADER_LINE_P (w);
-
   x0 = *x;
 
   /* First, move to the beginning of the row corresponding to *Y.  We
@@ -5204,8 +5199,13 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
     }
 #endif
 
-  if (it.vpos < w->current_matrix->nrows
-      && (row = MATRIX_ROW (w->current_matrix, it.vpos),
+  /* IT's vpos counts from the glyph row that includes the window's
+     start position, i.e. it excludes the header-line row, but
+     MATRIX_ROW includes the header-line row.  Adjust for a possible
+     header-line row.  */
+  it_vpos = it.vpos + WINDOW_WANTS_MODELINE_P (w);
+  if (it_vpos < w->current_matrix->nrows
+      && (row = MATRIX_ROW (w->current_matrix, it_vpos),
           row->enabled_p))
     {
       if (it.hpos < row->used[TEXT_AREA])
diff --git a/src/eval.c b/src/eval.c
index 4b2e256a722..02fc3426f83 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1273,7 +1273,7 @@ internal_lisp_condition_case (volatile Lisp_Object var, Lisp_Object bodyform,
   { /* The first clause is the one that should be checked first, so it should
        be added to handlerlist last.  So we build in `clauses' a table that
        contains `handlers' but in reverse order.  */
-    Lisp_Object *clauses = alloca (clausenb * sizeof (Lisp_Object *));
+    Lisp_Object *clauses = alloca (clausenb * sizeof *clauses);
     Lisp_Object *volatile clauses_volatile = clauses;
     int i = clausenb;
     for (val = handlers; CONSP (val); val = XCDR (val))
diff --git a/src/xdisp.c b/src/xdisp.c
index 4383c497d7a..93eea2c2b34 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27513,6 +27513,10 @@ display_and_set_cursor (struct window *w, bool on,
       && (!on
           || w->phys_cursor.x != x
           || w->phys_cursor.y != y
+          /* HPOS can be negative in R2L rows whose
+             exact_window_width_line_p flag is set (i.e. their newline
+             would "overflow into the fringe").  */
+          || hpos < 0
           || new_cursor_type != w->phys_cursor_type
           || ((new_cursor_type == BAR_CURSOR || new_cursor_type == HBAR_CURSOR)
               && new_cursor_width != w->phys_cursor_width)))