Merge from origin/emacs-25

b13cab6 Add a eww command to toggle paragraph direction
4e46128 * nextstep/WISHLIST: Merge into etc/TODO and remove.
9e078e5 Fix char signedness issue in bidi code
064adf6 * lib-src/pop.c (socket_connection): Fix format string.
14060a9 Avoid inflooping in thing-at-point-looking-at
098d47b * lisp/emacs-lisp/derived.el (define-derived-mode): Revert
        indent change.
b5db8e0 etc/PROBLEMS: Mention problems with using file descriptors
ec10ef9 * lisp/apropos.el (apropos-variable): Doc fix.  (Bug#22813).
d2dd614 Remove unneeded workaround in xftfont.c
9b7593c ; * etc/NEWS: Reflect latest changes in saveplace.
fde0cd1 * lisp/saveplace.el (save-place-local-mode): New minor mode
06a872b Fix redisplay on a TTY after 'make-frame'
95f5a43 Make double-click-1 work with unbalanced parens in CC Mode.
        Fixes bug#5560.
7d206fc Input method polish-slash should not use keyboard translation
8be32cf Fix an assertion
040e0d6 Fix 'toggle-save-place'
5244db2 * src/keyboard.c: Don't inadvertently set immediate_echo (bug#22581)

5 files changed, 31 insertions, 24 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 7d7d7305b43..00667c5a8fa 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1973,8 +1973,8 @@ struct bidi_it {
                                    resolving weak and neutral types */
   bidi_type_t type_after_wn;    /* bidi type after overrides and Wn */
   bidi_type_t orig_type;        /* original bidi type, as found in the buffer */
-  char resolved_level;          /* final resolved level of this character */
-  char isolate_level;           /* count of isolate initiators unmatched by PDI */
+  signed char resolved_level;   /* final resolved level of this character */
+  signed char isolate_level;    /* count of isolate initiators unmatched by PDI */
   ptrdiff_t invalid_levels;     /* how many PDFs to ignore */
   ptrdiff_t invalid_isolates;   /* how many PDIs to ignore */
   struct bidi_saved_info prev;  /* info about previous character */
diff --git a/src/dispnew.c b/src/dispnew.c
index b05356a3b64..a9f06eb3c12 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -681,7 +681,9 @@ void
 clear_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end)
 {
   eassert (start <= end);
-  eassert (start >= 0 && start <= matrix->nrows);
+  eassert (start >= 0 && (start < matrix->nrows
+                          /* matrix->nrows can be 0 for the initial frame.  */
+                          || (matrix->nrows == 0)));
   eassert (end >= 0 && end <= matrix->nrows);
 
   for (; start < end; ++start)
diff --git a/src/keyboard.c b/src/keyboard.c
index 6535e04d826..4e1ac152a59 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -427,6 +427,15 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
 }
 
 
+static bool
+echo_keystrokes_p (void)
+{
+  return (!cursor_in_echo_area)
+         && (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
+             : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
+             : false);
+}
+
 /* Add C to the echo string, without echoing it immediately.  C can be
    a character, which is pretty-printed, or a symbol, whose name is
    printed.  */
@@ -568,7 +577,9 @@ echo_update (void)
 static void
 echo_now (void)
 {
-  if (!current_kboard->immediate_echo)
+  if (!current_kboard->immediate_echo
+      /* This test breaks calls that use `echo_now' to display the echo_prompt.
+         && echo_keystrokes_p () */)
     {
       current_kboard->immediate_echo = true;
       echo_update ();
@@ -2270,13 +2281,6 @@ read_decoded_event_from_main_queue (struct timespec *end_time,
     }
 }
 
-static bool
-echo_keystrokes_p (void)
-{
-  return (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
-          : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0 : false);
-}
-
 /* Read a character from the keyboard; call the redisplay if needed.  */
 /* commandflag 0 means do not autosave, but do redisplay.
    -1 means do not redisplay, but do autosave.
@@ -8889,11 +8893,15 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
              of echoing, so that it serves as a prompt for the next
              character.  */
           kset_echo_prompt (current_kboard, prompt);
+          /* FIXME: This use of echo_now doesn't look quite right and is ugly
+             since it forces us to fiddle with current_kboard->immediate_echo
+             before and after.  */
           current_kboard->immediate_echo = false;
           echo_now ();
+          if (!echo_keystrokes_p ())
+            current_kboard->immediate_echo = false;
         }
-      else if (cursor_in_echo_area
-               && echo_keystrokes_p ())
+      else if (echo_keystrokes_p ())
         /* This doesn't put in a dash if the echo buffer is empty, so
            you don't always see a dash hanging out in the minibuffer.  */
         echo_dash ();
diff --git a/src/xdisp.c b/src/xdisp.c
index acb275481ad..b9d496ed556 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11232,6 +11232,7 @@ clear_garbaged_frames (void)
   if (frame_garbaged)
     {
       Lisp_Object tail, frame;
+      struct frame *sf = SELECTED_FRAME ();
 
       FOR_EACH_FRAME (tail, frame)
         {
@@ -11239,7 +11240,13 @@ clear_garbaged_frames (void)
 
           if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
             {
-              if (f->resized_p)
+              if (f->resized_p
+                  /* It makes no sense to redraw a non-selected TTY
+                     frame, since that will actually clear the
+                     selected frame, and might leave the selected
+                     frame with corrupted display, if it happens not
+                     to be marked garbaged.  */
+                  && !(f != sf && (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))))
                 redraw_frame (f);
               else
                 clear_current_matrices (f);
diff --git a/src/xftfont.c b/src/xftfont.c
index 110f99a9be9..d94955f296a 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -395,16 +395,6 @@ xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
 
   font->ascent = xftfont->ascent;
   font->descent = xftfont->descent;
-  if (pixel_size >= 5)
-    {
-      /* The above condition is a dirty workaround because
-         XftTextExtents8 behaves strangely for some fonts
-         (e.g. "Dejavu Sans Mono") when pixel_size is less than 5. */
-      if (font->ascent < extents.y)
-        font->ascent = extents.y;
-      if (font->descent < extents.height - extents.y)
-        font->descent = extents.height - extents.y;
-    }
   font->height = font->ascent + font->descent;
 
   if (XINT (AREF (entity, FONT_SIZE_INDEX)) == 0)