From c6bdd1107112f2eaf0bfb0964f2aeb636d6389c8 Mon Sep 17 00:00:00 2001 From: Thierry Volpiatto Date: Mon, 11 Mar 2013 14:30:49 -0400 Subject: [PATCH] * lisp/net/net-utils.el (net-utils-remove-ctrl-m-filter): Use with-current-buffer and don't move point. (net-utils-run-simple): Remove useless code. (net-utils-remove-ctl-m): Remove unused custom. --- lisp/ChangeLog | 7 +++++++ lisp/net/net-utils.el | 36 +++++++++++------------------------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0361e5af0aa..bdfa6ae25ac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-03-11 Thierry Volpiatto + + * net/net-utils.el (net-utils-remove-ctrl-m-filter): + Use with-current-buffer and don't move point. + (net-utils-run-simple): Remove useless code. + (net-utils-remove-ctl-m): Remove unused custom. + 2013-03-11 Per Starbäck * international/characters.el (glyphless-set-char-table-range): New fun. diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 82c1ce010b8..9a6c7b124c7 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -54,11 +54,6 @@ :group 'comm :version "20.3") -(defcustom net-utils-remove-ctl-m (memq system-type '(windows-nt msdos)) - "If non-nil, remove control-Ms from output." - :group 'net-utils - :type 'boolean) - (defcustom traceroute-program (if (eq system-type 'windows-nt) "tracert" @@ -319,25 +314,17 @@ This variable is only used if the variable (defun net-utils-remove-ctrl-m-filter (process output-string) "Remove trailing control Ms." - (let ((old-buffer (current-buffer)) - (filtered-string output-string)) - (unwind-protect - (let ((moving)) - (set-buffer (process-buffer process)) - (let ((inhibit-read-only t)) - (setq moving (= (point) (process-mark process))) - - (while (string-match "\r" filtered-string) - (setq filtered-string - (replace-match "" nil nil filtered-string))) - - (save-excursion - ;; Insert the text, moving the process-marker. - (goto-char (process-mark process)) - (insert filtered-string) - (set-marker (process-mark process) (point)))) - (if moving (goto-char (process-mark process)))) - (set-buffer old-buffer)))) + (with-current-buffer (process-buffer process) + (save-excursion + (let ((inhibit-read-only t) + (filtered-string output-string)) + (while (string-match "\r" filtered-string) + (setq filtered-string + (replace-match "" nil nil filtered-string))) + ;; Insert the text, moving the process-marker. + (goto-char (process-mark process)) + (insert filtered-string) + (set-marker (process-mark process) (point)))))) (defun net-utils-run-program (name header program args) "Run a network information program." @@ -375,7 +362,6 @@ This variable is only used if the variable (apply 'start-process program-name (current-buffer) program-name args) 'net-utils-remove-ctrl-m-filter) - (goto-char (point-min)) (unless nodisplay (display-buffer (current-buffer))))) (defun net-utils--revert-function (&optional ignore-auto noconfirm) -- 2.39.2