diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/goto-addr.el | 1 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index 89695b61b36..44970f7aaf3 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el @@ -250,6 +250,7 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and (interactive) (if goto-address-highlight-p (goto-address-fontify))) +;;;###autoload(put 'goto-address 'safe-local-eval-function t) (provide 'goto-addr) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c94ec48b76d..cb5a6d75331 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3572,7 +3572,8 @@ This will break if COMMAND prints a newline, followed by the value of ;; for `find-grep-dired' and `find-name-dired' in Emacs 22. (if (tramp-tramp-file-p default-directory) (with-parsed-tramp-file-name default-directory nil - (let ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command)) + (let ((curbuf (current-buffer)) + (asynchronous (string-match "[ \t]*&[ \t]*\\'" command)) status) (unless output-buffer (setq output-buffer @@ -3674,6 +3675,7 @@ This will break if COMMAND prints a newline, followed by the value of (unless (zerop (buffer-size)) (when tramp-display-shell-command-buffer (display-buffer output-buffer))) + (set-buffer curbuf) status)) ;; The following is only executed if something strange was ;; happening. Emit a helpful message and do it anyway. |