diff options
author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2013-03-01 12:27:57 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-01 12:27:57 -0500 |
commit | 7944eaa3362860c1afd7cc9d0d2ea4d71c289989 (patch) | |
tree | d56ebf4fc8adfd0cb9fce79db8952851a989e314 | |
parent | 325b66a6d1b648a6db2bcdc2bab14896dc67c099 (diff) | |
download | emacs-7944eaa3362860c1afd7cc9d0d2ea4d71c289989.tar.gz |
* lisp/net/net-utils.el (net-utils-run-simple): Don't display-buffer
when reverting.
Fixes: debbugs:13831
-rw-r--r-- | lisp/ChangeLog | 7 | ||||
-rw-r--r-- | lisp/net/net-utils.el | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b9f7436f6f..3183743db3e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,11 @@ +2013-03-01 Thierry Volpiatto <thierry.volpiatto@gmail.com> + + * net/net-utils.el (net-utils-run-simple): Don't display-buffer + when reverting (bug#13831). + 2013-03-01 Agustín Martín Domingo <agustin.martin@hispalinux.es> - * textmodes/ispell.el (ispell-find-hunspell-dictionaries): + * textmodes/ispell.el (ispell-find-hunspell-dictionaries): Always expand affix-file before storing to protect against changed `default-directory'. (ispell-print-if-debug): Make sure message is printed at the end diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index cc28bab733f..82c1ce010b8 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -358,7 +358,7 @@ This variable is only used if the variable ;; Todo: This data could be saved in a bookmark. (defvar net-utils--revert-cmd nil) -(defun net-utils-run-simple (buffer program-name args) +(defun net-utils-run-simple (buffer program-name args &optional nodisplay) "Run a network utility for diagnostic output only." (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer) (let ((proc (get-buffer-process (current-buffer)))) @@ -369,13 +369,14 @@ This variable is only used if the variable (erase-buffer)) (net-utils-mode) (setq-local net-utils--revert-cmd - `(net-utils-run-simple ,(current-buffer) ,program-name ,args)) + `(net-utils-run-simple ,(current-buffer) + ,program-name ,args nodisplay)) (set-process-filter (apply 'start-process program-name (current-buffer) program-name args) 'net-utils-remove-ctrl-m-filter) (goto-char (point-min)) - (display-buffer (current-buffer)))) + (unless nodisplay (display-buffer (current-buffer))))) (defun net-utils--revert-function (&optional ignore-auto noconfirm) (message "Reverting `%s'..." (buffer-name)) |