Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu

4 files changed, 18 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2654abd32d4..4e01e155c2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-09-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero,
+        always make sure the marginal areas of the row are in sync with
+        what the window wants.  (Bug#18419)
+
+        * data.c (set_internal): Use assq_no_quit, not Fassq, to find an
+        existing binding of a variable, to avoid silently aborting
+        commands that use specbind.  (Bug#18331)
+
 2014-09-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix bug uncovered by changing alloca to auto buffer (Bug#18410).
diff --git a/src/data.c b/src/data.c
index a155fe6f84a..fd515af5003 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1311,10 +1311,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
 
             /* Find the new binding.  */
             XSETSYMBOL (symbol, sym); /* May have changed via aliasing.  */
-            tem1 = Fassq (symbol,
-                          (blv->frame_local
-                           ? XFRAME (where)->param_alist
-                           : BVAR (XBUFFER (where), local_var_alist)));
+            tem1 = assq_no_quit (symbol,
+                                 (blv->frame_local
+                                  ? XFRAME (where)->param_alist
+                                  : BVAR (XBUFFER (where), local_var_alist)));
             set_blv_where (blv, where);
             blv->found = 1;
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 73b6253e124..bc5164f3ba8 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1082,8 +1082,7 @@ prepare_desired_row (struct window *w, struct glyph_row *row, bool mode_line_p)
       if (w->right_margin_cols > 0)
         row->glyphs[RIGHT_MARGIN_AREA] = row->glyphs[LAST_AREA];
     }
-  else if (row == MATRIX_MODE_LINE_ROW (w->desired_matrix)
-           || row == MATRIX_HEADER_LINE_ROW (w->desired_matrix))
+  else
     {
       /* The real number of glyphs reserved for the margins is
          recorded in the glyph matrix, and can be different from
@@ -1093,8 +1092,8 @@ prepare_desired_row (struct window *w, struct glyph_row *row, bool mode_line_p)
       int right = w->desired_matrix->right_margin_glyphs;
 
       /* Make sure the marginal areas of this row are in sync with
-         what the window wants, when the 1st/last row of the matrix
-         actually displays text and not header/mode line.  */
+         what the window wants, when the row actually displays text
+         and not header/mode line.  */
       if (w->left_margin_cols > 0
           && (left != row->glyphs[TEXT_AREA] - row->glyphs[LEFT_MARGIN_AREA]))
         row->glyphs[TEXT_AREA] = row->glyphs[LEFT_MARGIN_AREA] + left;
diff --git a/src/sysdep.c b/src/sysdep.c
index 34fd8b1044b..24cc5cb0b40 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2457,7 +2457,7 @@ emacs_full_write (int fildes, char const *buf, ptrdiff_t nbyte,
         {
           if (errno == EINTR)
             {
-              /* I originally used `QUIT' but that might causes files to
+              /* I originally used `QUIT' but that might cause files to
                  be truncated if you hit C-g in the middle of it.  --Stef  */
               if (process_signals && pending_signals)
                 process_pending_signals ();