Merge remote-tracking branch 'savannah/master' into native-comp

6 files changed, 55 insertions, 27 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 991f79abac7..fb20fc96550 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2945,7 +2945,7 @@ usage: (propertize STRING &rest PROPERTIES)  */)
 
   /* Number of args must be odd.  */
   if ((nargs & 1) == 0)
-    error ("Wrong number of arguments");
+    xsignal2 (Qwrong_number_of_arguments, Qpropertize, make_fixnum (nargs));
 
   properties = string = Qnil;
 
@@ -4448,6 +4448,7 @@ syms_of_editfns (void)
 {
   DEFSYM (Qbuffer_access_fontify_functions, "buffer-access-fontify-functions");
   DEFSYM (Qwall, "wall");
+  DEFSYM (Qpropertize, "propertize");
 
   DEFVAR_LISP ("inhibit-field-text-motion", Vinhibit_field_text_motion,
                doc: /* Non-nil means text motion commands don't notice fields.  */);
diff --git a/src/fns.c b/src/fns.c
index c16f9c63998..7914bd47790 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2873,6 +2873,9 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil.  */)
       return obj;
     }
 
+  if (use_short_answers)
+    return call1 (intern ("y-or-n-p"), prompt);
+
   AUTO_STRING (yes_or_no, "(yes or no) ");
   prompt = CALLN (Fconcat, prompt, yes_or_no);
 
@@ -5904,6 +5907,15 @@ that disables the use of a file dialog, regardless of the value of
 this variable.  */);
   use_file_dialog = true;
 
+  DEFVAR_BOOL ("use-short-answers", use_short_answers,
+    doc: /* Non-nil means `yes-or-no-p' uses shorter answers "y" or "n".
+When non-nil, `yes-or-no-p' will use `y-or-n-p' to read the answer.
+We recommend against setting this variable non-nil, because `yes-or-no-p'
+is intended to be used when users are expected not to respond too
+quickly, but to take their time and perhaps think about the answer.
+The same variable also affects the function `read-answer'.  */);
+  use_short_answers = false;
+
   defsubr (&Sidentity);
   defsubr (&Srandom);
   defsubr (&Slength);
diff --git a/src/gnutls.c b/src/gnutls.c
index aa245ee5c39..4d5a909db0d 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -625,6 +625,8 @@ gnutls_try_handshake (struct Lisp_Process *proc)
 
   while ((ret = gnutls_handshake (state)) < 0)
     {
+      if (gnutls_error_is_fatal (ret))
+        return emacs_gnutls_handle_error (state, ret);
       do
         ret = gnutls_handshake (state);
       while (ret == GNUTLS_E_INTERRUPTED);
diff --git a/src/nsterm.m b/src/nsterm.m
index 88317f88393..bf175bbd188 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8411,13 +8411,16 @@ not_in_argv (NSString *arg)
 {
   NSTRACE ("EmacsView windowDidChangeBackingProperties:]");
 
-  NSRect frame = [self frame];
+  if ([self wantsUpdateLayer])
+    {
+      NSRect frame = [self frame];
 
-  [surface release];
-  surface = nil;
+      [surface release];
+      surface = nil;
 
-  ns_clear_frame (emacsframe);
-  expose_frame (emacsframe, 0, 0, NSWidth (frame), NSHeight (frame));
+      ns_clear_frame (emacsframe);
+      expose_frame (emacsframe, 0, 0, NSWidth (frame), NSHeight (frame));
+    }
 }
 #endif /* NS_DRAW_TO_BUFFER */
 
@@ -8480,7 +8483,7 @@ not_in_argv (NSString *arg)
 }
 
 
-#ifdef NS_IMPL_COCOA
+#ifdef NS_DRAW_TO_BUFFER
 /* If the frame has been garbaged but the toolkit wants to draw, for
    example when resizing the frame, we end up with a blank screen.
    Sometimes this results in an unpleasant flicker, so try to
@@ -8488,7 +8491,8 @@ not_in_argv (NSString *arg)
 - (void)viewWillDraw
 {
   if (FRAME_GARBAGED_P (emacsframe)
-      && !redisplaying_p)
+      && !redisplaying_p
+      && [self wantsUpdateLayer])
     {
       /* If there is IO going on when redisplay is run here Emacs
          crashes.  I think it's because this code will always be run
@@ -8505,10 +8509,8 @@ not_in_argv (NSString *arg)
       waiting_for_input = owfi;
     }
 }
-#endif
 
 
-#ifdef NS_DRAW_TO_BUFFER
 - (BOOL)wantsUpdateLayer
 {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101400
diff --git a/src/xdisp.c b/src/xdisp.c
index f86d3527b3d..cc0a689ba32 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10052,7 +10052,7 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos
               && (IT_CHARPOS (*it) > to_charpos
                   || (IT_CHARPOS (*it) == to_charpos
                       && to_charpos == ZV
-                      && FETCH_BYTE (ZV_BYTE - 1) != '\n')))
+                      && (ZV_BYTE <= 1 || FETCH_BYTE (ZV_BYTE - 1) != '\n'))))
             {
               reached = 9;
               goto out;
@@ -11857,18 +11857,27 @@ resize_mini_window (struct window *w, bool exact_p)
       max_height = clip_to_bounds (unit, max_height, windows_height);
 
       /* Find out the height of the text in the window.  */
-      if (it.line_wrap == TRUNCATE)
-        height = unit;
-      else
-        {
-          last_height = 0;
-          move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS);
-          if (it.max_ascent == 0 && it.max_descent == 0)
-            height = it.current_y + last_height;
-          else
-            height = it.current_y + it.max_ascent + it.max_descent;
-          height -= min (it.extra_line_spacing, it.max_extra_line_spacing);
+      last_height = 0;
+      move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS);
+      /* If move_it_to moved to the next visible line after EOB,
+         account for the height of the last full line.  */
+      if (it.max_ascent == 0 && it.max_descent == 0)
+        {
+          height = it.current_y;
+          /* Don't add the last line's height if lines are truncated
+             and the text doesn't end in a newline.
+             FIXME: if the text ends in a newline from a display
+             property or an overlay string, they lose: the mini-window
+             might not show the last empty line.  */
+          if (!(it.line_wrap == TRUNCATE
+                && it.current_x <= it.first_visible_x
+                && ZV_BYTE > 1
+                && FETCH_BYTE (ZV_BYTE - 1) != '\n'))
+            height += last_height;
         }
+      else
+        height = it.current_y + it.max_ascent + it.max_descent;
+      height -= min (it.extra_line_spacing, it.max_extra_line_spacing);
 
       /* Compute a suitable window start.  */
       if (height > max_height)
@@ -24109,7 +24118,8 @@ display_line (struct it *it, int cursor_vpos)
              the logical order.  */
           if (IT_BYTEPOS (*it) > BEG_BYTE)
             row->ends_at_zv_p =
-              IT_BYTEPOS (*it) >= ZV_BYTE && FETCH_BYTE (ZV_BYTE - 1) != '\n';
+              IT_BYTEPOS (*it) >= ZV_BYTE
+              && (ZV_BYTE <= 1 || FETCH_BYTE (ZV_BYTE - 1) != '\n');
           else
             row->ends_at_zv_p = false;
           break;
diff --git a/src/xfaces.c b/src/xfaces.c
index 4b020001c31..ab4440f46ad 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6034,10 +6034,11 @@ realize_gui_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE]
                 face->box = FACE_RAISED_BOX;
               else if (EQ (value, Qpressed_button))
                 face->box = FACE_SUNKEN_BOX;
-              else if (EQ (value, Qflat_button)) {
-                face->box = FACE_SIMPLE_BOX;
-                face->box_color = face->background;
-              }
+              else if (EQ (value, Qflat_button))
+                {
+                  face->box = FACE_SIMPLE_BOX;
+                  face->box_color = face->background;
+                }
             }
         }
     }