aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Volpiatto2013-03-01 12:27:57 -0500
committerStefan Monnier2013-03-01 12:27:57 -0500
commit7944eaa3362860c1afd7cc9d0d2ea4d71c289989 (patch)
treed56ebf4fc8adfd0cb9fce79db8952851a989e314
parent325b66a6d1b648a6db2bcdc2bab14896dc67c099 (diff)
downloademacs-7944eaa3362860c1afd7cc9d0d2ea4d71c289989.tar.gz
emacs-7944eaa3362860c1afd7cc9d0d2ea4d71c289989.zip
* lisp/net/net-utils.el (net-utils-run-simple): Don't display-buffer
when reverting. Fixes: debbugs:13831
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/net/net-utils.el7
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 @@
12013-03-01 Thierry Volpiatto <thierry.volpiatto@gmail.com>
2
3 * net/net-utils.el (net-utils-run-simple): Don't display-buffer
4 when reverting (bug#13831).
5
12013-03-01 Agustín Martín Domingo <agustin.martin@hispalinux.es> 62013-03-01 Agustín Martín Domingo <agustin.martin@hispalinux.es>
2 7
3 * textmodes/ispell.el (ispell-find-hunspell-dictionaries): 8 * textmodes/ispell.el (ispell-find-hunspell-dictionaries):
4 Always expand affix-file before storing to protect against changed 9 Always expand affix-file before storing to protect against changed
5 `default-directory'. 10 `default-directory'.
6 (ispell-print-if-debug): Make sure message is printed at the end 11 (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
358;; Todo: This data could be saved in a bookmark. 358;; Todo: This data could be saved in a bookmark.
359(defvar net-utils--revert-cmd nil) 359(defvar net-utils--revert-cmd nil)
360 360
361(defun net-utils-run-simple (buffer program-name args) 361(defun net-utils-run-simple (buffer program-name args &optional nodisplay)
362 "Run a network utility for diagnostic output only." 362 "Run a network utility for diagnostic output only."
363 (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer) 363 (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer)
364 (let ((proc (get-buffer-process (current-buffer)))) 364 (let ((proc (get-buffer-process (current-buffer))))
@@ -369,13 +369,14 @@ This variable is only used if the variable
369 (erase-buffer)) 369 (erase-buffer))
370 (net-utils-mode) 370 (net-utils-mode)
371 (setq-local net-utils--revert-cmd 371 (setq-local net-utils--revert-cmd
372 `(net-utils-run-simple ,(current-buffer) ,program-name ,args)) 372 `(net-utils-run-simple ,(current-buffer)
373 ,program-name ,args nodisplay))
373 (set-process-filter 374 (set-process-filter
374 (apply 'start-process program-name 375 (apply 'start-process program-name
375 (current-buffer) program-name args) 376 (current-buffer) program-name args)
376 'net-utils-remove-ctrl-m-filter) 377 'net-utils-remove-ctrl-m-filter)
377 (goto-char (point-min)) 378 (goto-char (point-min))
378 (display-buffer (current-buffer)))) 379 (unless nodisplay (display-buffer (current-buffer)))))
379 380
380(defun net-utils--revert-function (&optional ignore-auto noconfirm) 381(defun net-utils--revert-function (&optional ignore-auto noconfirm)
381 (message "Reverting `%s'..." (buffer-name)) 382 (message "Reverting `%s'..." (buffer-name))