From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#22679: 25.0.91; ibuffer-do-shell-command-pipe truncate output Date: Fri, 19 Aug 2016 17:33:00 +0900 (JST) Message-ID: References: <7oa66k9es.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: blaine.gmane.org 1471595664 22274 195.159.176.226 (19 Aug 2016 08:34:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 19 Aug 2016 08:34:24 +0000 (UTC) User-Agent: Alpine 2.20 (DEB 67 2015-01-07) Cc: Tino Calancha , 22679@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 19 10:34:20 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bafFr-0005Y5-Vg for geb-bug-gnu-emacs@m.gmane.org; Fri, 19 Aug 2016 10:34:20 +0200 Original-Received: from localhost ([::1]:56112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bafFp-0005ew-2C for geb-bug-gnu-emacs@m.gmane.org; Fri, 19 Aug 2016 04:34:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bafFg-0005ep-L8 for bug-gnu-emacs@gnu.org; Fri, 19 Aug 2016 04:34:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bafFa-0000Wg-MF for bug-gnu-emacs@gnu.org; Fri, 19 Aug 2016 04:34:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bafFa-0000WW-JO for bug-gnu-emacs@gnu.org; Fri, 19 Aug 2016 04:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bafFa-0006WW-C9 for bug-gnu-emacs@gnu.org; Fri, 19 Aug 2016 04:34:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 19 Aug 2016 08:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22679 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 22679-submit@debbugs.gnu.org id=B22679.147159559225016 (code B ref 22679); Fri, 19 Aug 2016 08:34:02 +0000 Original-Received: (at 22679) by debbugs.gnu.org; 19 Aug 2016 08:33:12 +0000 Original-Received: from localhost ([127.0.0.1]:33823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bafEm-0006VQ-Dt for submit@debbugs.gnu.org; Fri, 19 Aug 2016 04:33:12 -0400 Original-Received: from mail-pf0-f195.google.com ([209.85.192.195]:35070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bafEk-0006V8-Ok for 22679@debbugs.gnu.org; Fri, 19 Aug 2016 04:33:11 -0400 Original-Received: by mail-pf0-f195.google.com with SMTP id h186so1134596pfg.2 for <22679@debbugs.gnu.org>; Fri, 19 Aug 2016 01:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=VZlC5i0xJRupbl6Aj+QlmSEXbl3B0L+rwYWNdv8DOg0=; b=PFvn5z8aQmiSi3XFTLjhW8jzhzzWb0G/F4TCnmlgBKJ1+Of7qEpIMj2qCBNNJxxRMI mZcZ6gPKFEba31k3S/Dog0eD5C2xkNBMvaw1mA3mEGXresGstl9R2vLQGDza3jo4LjxJ BH6uYTLbgiDB9tEbLllujf+WTaCzrlmINoOyxmKkRXcxeHNZ6LJu1DjzT2gBTNQE1OUy fTSpQZg9Pw5Ru1xuKfDnJ5wT0877KsCVvj2+G7lNz7vocSaUVFT+0tNQzEoZahHZ7iuA f+Vvfewihb0pBLXZOaiGCyV2k5NPQ1WxbVqo/d7JJS4Vo1/ThY96zsIErbsHZ48doGyu FE0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=VZlC5i0xJRupbl6Aj+QlmSEXbl3B0L+rwYWNdv8DOg0=; b=FhKFk7q360fFPjOziHTJR6Y3PqB/U1vLbH1u7wlhd57WDCjE7MvC0w98I1+v+TxLrR bwTmpAanVESzj/tDcIKWe9FqBvgz7FbzoC5nhC5pRHzRXGZbFns+bt4evE/M2Owfr0u/ mQXFmYtTMnoIjhhshAQD6TI3t4MXitaulKMsBb6oBLzyb75SX3atb7L4xqFlyFcHo+0s 4YqvJMuhSBmGugIEB7U18N3ur1/wiko9ZmCTwNggUsU2InWE1yN6zZHQbPq/roBUeJOz gFmdU8d6+cTjTPWwIPVmP0Cmb+7rMkN3GjBUrdGjUNlMqY/WVYzkrzzakbPo/roaxKrA VLfQ== X-Gm-Message-State: AEkoouvCiZ5HQsjthJRi5qjGzvG4sh00EH5cU1PtO35Ah5C35JKFAI89Lqg74PlU+2tEVA== X-Received: by 10.98.36.134 with SMTP id k6mr11932860pfk.116.1471595584961; Fri, 19 Aug 2016 01:33:04 -0700 (PDT) Original-Received: from calancha-pc (214018171106.wi-fi.kddi.com. [106.171.18.214]) by smtp.gmail.com with ESMTPSA id m5sm9316018paw.40.2016.08.19.01.33.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Aug 2016 01:33:04 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:122381 Archived-At: On Wed, 13 Jul 2016, Stefan Monnier wrote: > shell-command is designed for interactive use. > > In 90% of the cases, Elisp code that uses shell-command would be just as > well, if not better, served by start/call-process. > > Maybe the better change is to create a new function (partly extracted > from shell-command) which would be halfway between shell-command and > start-process: i.e. designed for use from Elisp, but specifically > tailored to running shell code rather than some other executable. > > Then use that function in shell-command and ibuffer-do-shell-command-pipe. Hi Stefan, thanks for the indications. I would like to apply following patch, which avoid using 'shell-command': ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 49a77e617b26044c84f193753f1eb7ec4ccea5d8 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Fri, 19 Aug 2016 16:46:14 +0900 Subject: [PATCH] ibuffer-do-shell-command-pipe: Do not truncate output Fix Bug#22679 * lisp/ibuf-macs.el (define-ibuffer-op): Added optional args 'before' and 'after'. 'before' is a form to evaluate before the operation. 'after' is a form to evaluate after the operation. * lisp/ibuf-ext.el (ibuffer--after-shell-command-pos): New defvar; store a buffer position where to set the point in the output buffer after operation complete. (ibuffer--before-shell-command): New defun; erase output buffer if 'shell-command-not-erase-buffer' is nil and set 'ibuffer--after-shell-command-pos'. (ibuffer--after-shell-command): New defun; set point in the output buffer after operation complete. (ibuffer-do-shell-command-pipe, ibuffer-do-shell-command-file): Bind 'shell-command-not-erase-buffer' to non-nil while processing the buffers; use 'ibuffer--after-shell-command' to set the point in the output buffer. --- lisp/ibuf-ext.el | 83 +++++++++++++++++++++++++++++++++++++++++++------------ lisp/ibuf-macs.el | 8 +++++- 2 files changed, 72 insertions(+), 19 deletions(-) diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index f93957e..333104d 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -346,14 +346,58 @@ ibuffer-backward-filter-group (ibuffer-backward-filter-group 1)) (ibuffer-forward-line 0)) +;; The value `beg-last-out' in `shell-command-not-erase-buffer' +;; set the point at the beginning of the output of the first +;; buffer processed. +(defvar ibuffer--after-shell-command-pos) + +(defun ibuffer--before-shell-command () + (let ((obuf (get-buffer-create "*Shell Command Output*")) + (sym shell-command-not-erase-buffer) + final-pos) + (when (buffer-live-p obuf) + (with-current-buffer obuf + (unless sym + (setq buffer-read-only nil) + (let ((inhibit-read-only t)) + (erase-buffer))) + (setq final-pos + (cond ((or (not sym) (eq sym 'beg-last-out)) + (point-max)) + ((eq sym 'save-point) + (point)))) + (setq ibuffer--after-shell-command-pos + final-pos))))) + +(defun ibuffer--after-shell-command () + (let* ((obuf (get-buffer-create "*Shell Command Output*")) + (pos ibuffer--after-shell-command-pos) + (win (car (get-buffer-window-list obuf)))) + (setq ibuffer--after-shell-command-pos nil) + (with-current-buffer obuf + (unless pos (setq pos (point-max))) + (goto-char pos) + ;; Set point in the window displaying obuf, if any; otherwise + ;; display buf temporary in selected frame and set the point. + (if win + (set-window-point win pos) + (save-window-excursion + (let ((win (display-buffer obuf '(nil (inhibit-switch-frame . t))))) + (set-window-point win pos))))))) + ;;;###autoload (autoload 'ibuffer-do-shell-command-pipe "ibuf-ext") (define-ibuffer-op shell-command-pipe (command) "Pipe the contents of each marked buffer to shell command COMMAND." (:interactive "sPipe to shell command: " :opstring "Shell command executed on" - :modifier-p nil) - (shell-command-on-region - (point-min) (point-max) command)) + :modifier-p nil + :opstring "Shell command executed on" + :modifier-p nil + :before (funcall #'ibuffer--before-shell-command) + :after (funcall #'ibuffer--after-shell-command)) + (let ((out-buf (get-buffer "*Shell Command Output*"))) + (with-current-buffer out-buf (goto-char (point-max))) + (call-process-region (point-min) (point-max) command nil out-buf))) ;;;###autoload (autoload 'ibuffer-do-shell-command-pipe-replace "ibuf-ext") (define-ibuffer-op shell-command-pipe-replace (command) @@ -363,26 +407,29 @@ shell-command-pipe-replace :active-opstring "replace buffer contents in" :dangerous t :modifier-p t) - (with-current-buffer buf - (shell-command-on-region (point-min) (point-max) - command nil t))) + (call-process-region (point-min) (point-max) command t buf)) ;;;###autoload (autoload 'ibuffer-do-shell-command-file "ibuf-ext") (define-ibuffer-op shell-command-file (command) "Run shell command COMMAND separately on files of marked buffers." (:interactive "sShell command on buffer's file: " - :opstring "Shell command executed on" - :modifier-p nil) - (shell-command (concat command " " - (shell-quote-argument - (or buffer-file-name - (let ((file - (make-temp-file - (substring - (buffer-name) 0 - (min 10 (length (buffer-name))))))) - (write-region nil nil file nil 0) - file)))))) + :opstring "Shell command executed on" + :modifier-p nil + :before (funcall #'ibuffer--before-shell-command) + :after (funcall #'ibuffer--after-shell-command)) + (let ((file (and (not (buffer-modified-p)) + buffer-file-name)) + (out-buf (get-buffer "*Shell Command Output*"))) + (unless file + (setq file + (make-temp-file + (substring + (buffer-name) 0 + (min 10 (length (buffer-name)))))) + (write-region nil nil file nil 0)) + (with-current-buffer out-buf (goto-char (point-max))) + (call-process-shell-command (format "%s %s" command file) + nil out-buf nil))) ;;;###autoload (autoload 'ibuffer-do-eval "ibuf-ext") (define-ibuffer-op eval (form) diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index 27e7af9..8bb05ec 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -169,6 +169,8 @@ ibuffer-save-marks dangerous (opstring "operated on") (active-opstring "Operate on") + before + after complex) &rest body) "Generate a function which operates on a buffer. @@ -198,6 +200,8 @@ ibuffer-save-marks ACTIVE-OPSTRING is a string which will be displayed to the user in a confirmation message, in the form: \"Really ACTIVE-OPSTRING x buffers?\" +BEFORE is a form to evaluate before start the operation. +AFTER is a form to evaluate once the operation is complete. COMPLEX means this function is special; if COMPLEX is nil BODY evaluates once for each marked buffer, MBUF, with MBUF current and saving the point. If COMPLEX is non-nil, BODY evaluates @@ -206,7 +210,7 @@ ibuffer-save-marks marked buffer. BODY is evaluated with `buf' bound to the buffer object. -\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)" +\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING BEFORE AFTER COMPLEX) &rest BODY)" (declare (indent 2) (doc-string 3)) `(progn (defun ,(intern (concat (if (string-match "^ibuffer-do" (symbol-name op)) @@ -233,11 +237,13 @@ ibuffer-save-marks 'ibuffer-deletion-char) (_ 'ibuffer-marked-char)))) + ,before ; pre-operation form. ,(let* ((finish (append '(progn) (if (eq modifier-p t) '((setq ibuffer-did-modification t)) ()) + (and after `(,after)) ; post-operation form. `((ibuffer-redisplay t) (message ,(concat "Operation finished; " opstring " %s buffers") count)))) (inner-body (if complex -- 2.8.1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 25.1.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.20.7) of 2016-08-18 built on calancha-pc Repository revision: a4fa31150f186611ad083c3387e3cb2c5d25f991