Merge from origin/emacs-25

7c1802f * doc/lispref/text.texi (Columns): Remove a nonexistent refer...
9034c50 * doc/man/emacsclient.1: Document +line:column option.
06495c9 Fix rare problems with echo-area display and multiple frames
f99b512 In M-%, avoid making buffer-local binding of text-property-de...

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 5e473166d1db0b6bc47e2a50c5ea2e3402184633..55f02904fa1c74e2bcdd25c8735fb047b85c832e 100644 (file)
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2191,9 +2191,6 @@ This function returns the horizontal position of point, measured in
 columns, counting from 0 at the left margin.  The column position is the
 sum of the widths of all the displayed representations of the characters
 between the start of the current line and point.
-
-For an example of using @code{current-column}, see the description of
-@code{count-lines} in @ref{Text Lines}.
 @end defun
 
 @deffn Command move-to-column column &optional force

diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index e62fe930152f184b88d3fb7d211cd27fcab24a5a..010eeba19c1003036d3d253c2738741f9d1d5141 100644 (file)
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -49,9 +49,19 @@ If you set the variable "server-window" to a window or a frame, "C-x
 #" displays the server buffer in that window or in that frame.
 
 .SH OPTIONS
-The programs follow the usual GNU command line syntax, with long
+Most options follow the usual GNU command line syntax, with long
 options starting with two dashes ("\-").
 .TP
+.BI + line\fR[\fP\fB:\fPcolumn\fR]\fP
+Go to the specified
+.I line
+and
+.IR column .
+A missing
+.I column
+is treated as column 1.
+This option applies only to the next file specified.
+.TP
 .B \-a, \-\-alternate-editor=EDITOR
 if the Emacs server is not running, run the specified editor instead.
 This can also be specified via the ALTERNATE_EDITOR environment variable.

diff --git a/lisp/replace.el b/lisp/replace.el
index 2c6a23ae6185883ab496e0eb510c8fac201005fa..91e5db818f9ed33c5063990365cce4d086ccb553 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -167,8 +167,6 @@ wants to replace FROM with TO."
     ;; unavailable while preparing to dump.
     (custom-reevaluate-setting 'query-replace-from-to-separator)
     (let* ((history-add-new-input nil)
-          (text-property-default-nonsticky
-           (cons '(separator . t) text-property-default-nonsticky))
           (separator
            (when query-replace-from-to-separator
              (propertize "\0"
@@ -193,11 +191,18 @@ wants to replace FROM with TO."
            ;; a region in order to specify the minibuffer input.
            ;; That should not clobber the region for the query-replace itself.
            (save-excursion
-             (if regexp-flag
-                 (read-regexp prompt nil 'query-replace-from-to-history)
-               (read-from-minibuffer
-                prompt nil nil nil 'query-replace-from-to-history
-                (car (if regexp-flag regexp-search-ring search-ring)) t))))
+              ;; The `with-current-buffer' ensures that the binding
+              ;; for `text-property-default-nonsticky' isn't a buffer
+              ;; local binding in the current buffer, which
+              ;; `read-from-minibuffer' wouldn't see.
+              (with-current-buffer (window-buffer (minibuffer-window))
+                (let ((text-property-default-nonsticky
+                       (cons '(separator . t) text-property-default-nonsticky)))
+                  (if regexp-flag
+                      (read-regexp prompt nil 'query-replace-from-to-history)
+                    (read-from-minibuffer
+                     prompt nil nil nil 'query-replace-from-to-history
+                     (car (if regexp-flag regexp-search-ring search-ring)) t))))))
            (to))
       (if (and (zerop (length from)) query-replace-defaults)
          (cons (caar query-replace-defaults)

diff --git a/src/xdisp.c b/src/xdisp.c
index 290f69878da6496553ac005b00dec4206f91b61b..11b20f99a27e53455075bbf13f66c60d799c8d4e 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17046,7 +17046,16 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
            ignore_mouse_drag_p = true;
 #endif
         }
+      ptrdiff_t count1 = SPECPDL_INDEX ();
+      /* x_consider_frame_title calls select-frame, which calls
+        resize_mini_window, which could resize the mini-window and by
+        that undo the effect of this redisplay cycle wrt minibuffer
+        and echo-area display.  Binding inhibit-redisplay to t makes
+        the call to resize_mini_window a no-op, thus avoiding the
+        adverse side effects.  */
+      specbind (Qinhibit_redisplay, Qt);
       x_consider_frame_title (w->frame);
+      unbind_to (count1, Qnil);
 #endif
     }