From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.bugs Subject: bug#13831: 24.3.50; [PATCH] net-utils-mode have no revert-buffer function Date: Fri, 01 Mar 2013 08:02:34 +0100 Organization: Emacs Helm Message-ID: <87zjyny54l.fsf@gmail.com> References: <87liaam7dh.fsf@gmail.com> <87hakym6il.fsf@gmail.com> <87d2vmm3nh.fsf@gmail.com> <871uc1ese2.fsf@gmail.com> <87k3ptbtoj.fsf@gmail.com> <877gltm05y.fsf@gmail.com> <87vc9cgr2i.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1362121389 7503 80.91.229.3 (1 Mar 2013 07:03:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Mar 2013 07:03:09 +0000 (UTC) Cc: 13831@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 01 08:03:33 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UBK09-00058n-K8 for geb-bug-gnu-emacs@m.gmane.org; Fri, 01 Mar 2013 08:03:29 +0100 Original-Received: from localhost ([::1]:57694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBJzo-0005OW-5J for geb-bug-gnu-emacs@m.gmane.org; Fri, 01 Mar 2013 02:03:08 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:51999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBJzj-0005OP-Qw for bug-gnu-emacs@gnu.org; Fri, 01 Mar 2013 02:03:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBJzi-0004sj-Dr for bug-gnu-emacs@gnu.org; Fri, 01 Mar 2013 02:03:03 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBJzi-0004sP-9M for bug-gnu-emacs@gnu.org; Fri, 01 Mar 2013 02:03:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1UBK1d-0007FW-P1 for bug-gnu-emacs@gnu.org; Fri, 01 Mar 2013 02:05:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Thierry Volpiatto Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 01 Mar 2013 07:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 13831 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 13831-submit@debbugs.gnu.org id=B13831.136212148427835 (code B ref 13831); Fri, 01 Mar 2013 07:05:01 +0000 Original-Received: (at 13831) by debbugs.gnu.org; 1 Mar 2013 07:04:44 +0000 Original-Received: from localhost ([127.0.0.1]:57328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UBK1L-0007Et-G9 for submit@debbugs.gnu.org; Fri, 01 Mar 2013 02:04:44 -0500 Original-Received: from mail-ee0-f43.google.com ([74.125.83.43]:60333) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UBK1H-0007Ek-EI for 13831@debbugs.gnu.org; Fri, 01 Mar 2013 02:04:41 -0500 Original-Received: by mail-ee0-f43.google.com with SMTP id c50so2151106eek.2 for <13831@debbugs.gnu.org>; Thu, 28 Feb 2013 23:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:organization:references:date :in-reply-to:message-id:user-agent:mime-version:content-type; bh=5kk6mJfBg91fzMtp4HngBR/ymsVwDt1cukc8pMpLWTY=; b=WUaQtYThd7hAYfYEewnvf3ZNOF+XCqxwuEAsvJNlxuU/rcGPeOmUif+5eqhxVOjlw9 W5eTYBR4WBA4Tekxi1JzsYIGMEZYu9yLBH38icgh3zONFj5U2JIuoFjHpBZca8RtrDVy Z6N2ICgoJtn1fqAm5YCIZQcXv6jsYnnvSgB0UsAQTxhmQW8MYGNIHQsliW16fr8QK7Qp hjEk470KayVBR/pP9sgd+dSXXhTfJHTX/nd+SzZbXEijGAzuKtdiirrzV6K/Rwr7BqC5 /4s3yS9LcQ7BiD0pcR4jc7GeLCdu2yUk8V9ZoE3YRGXBg61n1+oRqSDmcr9ztXAqK16G aPDw== X-Received: by 10.14.183.67 with SMTP id p43mr24865251eem.10.1362121358162; Thu, 28 Feb 2013 23:02:38 -0800 (PST) Original-Received: from dell-14z (lbe83-2-78-243-104-167.fbx.proxad.net. [78.243.104.167]) by mx.google.com with ESMTPS id a1sm15650326eep.2.2013.02.28.23.02.36 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 28 Feb 2013 23:02:36 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Thu, 28 Feb 2013 22:05:06 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:71972 Archived-At: Hi Stefan, Stefan Monnier writes: >> Indeed yes, tried this very early this morning. >> Just tried now and it is working, > > Thanks. > >> but point move at eof, it should stay on top of buffer. > > I think the difference between the initial run and the revert is that > for the initial run, the traceroute buffer is not in the > selected-window, whereas in the revert case, it is the selected-window. > > Apparently the behavior is partly on purpose, since > net-utils-remove-ctrl-m-filter (which, BTW, should use > with-current-buffer rather than unwind-protect) explicitly moves point. Here your patch modified, I have simplified `net-utils-remove-ctrl-m-filter'. diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 28fd5c6..5fe8d35 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -285,7 +285,8 @@ This variable is only used if the variable (define-derived-mode net-utils-mode special-mode "NetworkUtil" "Major mode for interacting with an external network utility." (set (make-local-variable 'font-lock-defaults) - '((net-utils-font-lock-keywords)))) + '((net-utils-font-lock-keywords))) + (setq-local revert-buffer-function #'net-utils--revert-function)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Utility functions @@ -318,25 +319,18 @@ 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)))) + (save-selected-window + (set-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." @@ -354,20 +348,38 @@ This variable is only used if the variable ;; General network utilities (diagnostic) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun net-utils-run-simple (buffer-name program-name args) +;; Todo: This data could be saved in a bookmark. +(defvar net-utils--revert-cmd nil) + +(defun net-utils-run-simple (buffer program-name args) "Run a network utility for diagnostic output only." - (interactive) - (when (get-buffer buffer-name) - (kill-buffer buffer-name)) - (get-buffer-create buffer-name) - (with-current-buffer buffer-name + (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer) + (let ((proc (get-buffer-process (current-buffer)))) + (when proc + (set-process-filter proc nil) + (delete-process proc))) + (let ((inhibit-read-only t)) + (erase-buffer)) (net-utils-mode) + (setq-local net-utils--revert-cmd + `(net-utils-run-simple ,(current-buffer) ,program-name ,args)) (set-process-filter - (apply 'start-process (format "%s" program-name) - buffer-name program-name args) + (apply 'start-process program-name + (current-buffer) program-name args) 'net-utils-remove-ctrl-m-filter) - (goto-char (point-min))) - (display-buffer buffer-name)) + (goto-char (point-min)) + (display-buffer (current-buffer)))) + +(defun net-utils--revert-function (&optional ignore-auto noconfirm) + (message "Reverting `%s'..." (buffer-name)) + (apply (car net-utils--revert-cmd) (cdr net-utils--revert-cmd)) + (let ((proc (get-buffer-process (current-buffer)))) + (when proc + (set-process-sentinel + proc + (lambda (process event) + (when (string= event "finished\n") + (message "Reverting `%s' done" (process-buffer process)))))))) ;;;###autoload (defun ifconfig () @@ -428,9 +440,8 @@ This variable is only used if the variable (if traceroute-program-options (append traceroute-program-options (list target)) (list target)))) - (net-utils-run-program + (net-utils-run-simple (concat "Traceroute" " " target) - (concat "** Traceroute ** " traceroute-program " ** " target) traceroute-program options))) -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997