mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/net/net-utils.el (net-utils-remove-ctrl-m-filter):

Browse source 
Use with-current-buffer and don't move point.
(net-utils-run-simple): Remove useless code.
(net-utils-remove-ctl-m): Remove unused custom.
This commit is contained in:
Thierry Volpiatto 2013-03-11 14:30:49 -04:00 • committed by Stefan Monnier
parent bd3921f0b8
commit c6bdd11071
2 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2013-03-11 Thierry Volpiatto <thierry.volpiatto@gmail.com>
* 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 <starback@stp.lingfil.uu.se>
* international/characters.el (glyphless-set-char-table-range): New fun.

36
lisp/net/net-utils.el
View file

@ -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)