Merge from origin/emacs-26

ea77c65 Revert "Temporary workaround for bug #32848 for branch emacs-26"
2c8ea46 Revert "* etc/NEWS: Note setting make-cursor-line-fully-visib...
f8df6f2 * etc/NEWS: Note setting make-cursor-line-fully-visible to ni...
cdca208 Fix note about interactive advice (Bug#32905)
508c40e Comple fix for Bug#32550

2 files changed, 17 insertions, 16 deletions

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 05bc8c73d58..3be52d8e624 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1679,7 +1679,9 @@ Note: The interactive spec of @var{function} will apply to the combined
 function and should hence obey the calling convention of the combined function
 rather than that of @var{function}.  In many cases, it makes no difference
 since they are identical, but it does matter for @code{:around},
-@code{:filter-args}, and @code{filter-return}, where @var{function}.
+@code{:filter-args}, and @code{:filter-return}, where @var{function}
+receives different arguments than the original function stored in
+@var{place}.
 @end defmac
 
 @defmac remove-function place function
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e1602db1492..08a225602aa 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2003,21 +2003,20 @@ been set up by `rfn-eshadow-setup-minibuffer'."
                    (minibuffer-prompt-end)))
           ;; We do not want to send any remote command.
           (non-essential t))
-      (when
-          (tramp-tramp-file-p
-           (buffer-substring-no-properties end (point-max)))
-        (save-restriction
-          (narrow-to-region
-           (1+ (or (string-match
-                    (tramp-rfn-eshadow-update-overlay-regexp)
-                    (buffer-string) end)
-                   end))
-           (point-max))
-          (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
-                (rfn-eshadow-update-overlay-hook nil)
-                file-name-handler-alist)
-            (move-overlay rfn-eshadow-overlay (point-max) (point-max))
-            (rfn-eshadow-update-overlay)))))))
+      (when (tramp-tramp-file-p (buffer-substring end (point-max)))
+        (save-excursion
+          (save-restriction
+            (narrow-to-region
+             (1+ (or (string-match
+                      (tramp-rfn-eshadow-update-overlay-regexp)
+                      (buffer-string) end)
+                     end))
+             (point-max))
+            (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay)
+                  (rfn-eshadow-update-overlay-hook nil)
+                  file-name-handler-alist)
+              (move-overlay rfn-eshadow-overlay (point-max) (point-max))
+              (rfn-eshadow-update-overlay))))))))
 
 (add-hook 'rfn-eshadow-update-overlay-hook
           'tramp-rfn-eshadow-update-overlay)