From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#62599: 30.0.50; Improve ibuffer-diff-with-file Date: Sat, 01 Apr 2023 23:20:46 +0100 Message-ID: <875yafkzwh.fsf@tcd.ie> Reply-To: "Basil L. Contovounesios" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30025"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 62599@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 02 00:21:23 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pijb8-0007WA-Au for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 02 Apr 2023 00:21:22 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pijaq-00024D-QP; Sat, 01 Apr 2023 18:21:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pijap-00023x-06 for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2023 18:21:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pijao-0001rB-Ot for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2023 18:21:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pijao-0003Cw-7x for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2023 18:21:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 01 Apr 2023 22:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62599 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.168038766112300 (code B ref -1); Sat, 01 Apr 2023 22:21:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 1 Apr 2023 22:21:01 +0000 Original-Received: from localhost ([127.0.0.1]:38670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pijam-0003CJ-7D for submit@debbugs.gnu.org; Sat, 01 Apr 2023 18:21:00 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:36424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pijaj-0003CB-DS for submit@debbugs.gnu.org; Sat, 01 Apr 2023 18:20:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pijaj-00023X-0r for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2023 18:20:57 -0400 Original-Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pijag-0001qb-1Z for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2023 18:20:56 -0400 Original-Received: by mail-wm1-x32c.google.com with SMTP id l37so14943188wms.2 for ; Sat, 01 Apr 2023 15:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1680387648; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=g632fcOcR6uFyaNmyuXaGoh11MMV1Awfc40Etg14K8w=; b=P9gLeN9NwjMKbuM37Ub1BypR4DMDAb1ytIy3Gk64oe+85eqrK7+fJHCq7gJ7nAOdG3 f6xLHYa5mQ9maoe6RG5YHfH70C5YoirqxR2RdSQ19Md3byseOy3TWSeW2Ma1vJ3Sjzla x4+0waksIOUKf2DJdq9mpX8H3WOlqzQP1jR3WtTFXmZkDrok8SSaAcIQ/FeVDAfjsxeI 6se1tfSHhq1Fj8eXui9KBr8tM6uEYsKmEcLlpg8JF6H+TAmLNpX9C5an1LQnDZ4cQVw0 NmHSXaNlS4k0+hnby9L1tivrBQW0i0Lz3qKGC4aWZdzBQATd9MxTq8+SV94crmlGSyfE kifw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680387648; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=g632fcOcR6uFyaNmyuXaGoh11MMV1Awfc40Etg14K8w=; b=ZMqQAZ6zI1JQrgAEIIsrJbOIFbNgF2NnsdLJYrjvPapjEEI5UfKw0luV11ngD9iPkd ObSNa8zRN25ysTYCABdo+O7/FYanPPAyCxdS0/0yuso+e6H00KIIc7/cBPNst0E89D0W 8m/fpHXuYqHtu170UmTGhgCmBpuzbVAkjfoh328ObkXqQG2S8zD0pvna02+M+DZE6jBa r54H1qcj9n5ee1oLlhOA4Q08OL3AkGYLxf69Kkxc7gGG/yQ9TUVqu2pQY5VzCONzol6G 7xdSHJ5GcxlSiOpMCDiRCXvpIiwM0DHgLB8jh1/vTgZbH9rk9u/Q+vC+xdttj4ySuWSk mvyA== X-Gm-Message-State: AO0yUKXNOdC/EhVS+EN/Xi5ozuav/MGUFOPY+pA8MtmVayKcnp8xthYD SCraBLBUERTSegoIPJ3KNgRFHfqKzL0AnkRIJ+I= X-Google-Smtp-Source: AK7set95SxIyaM5pSCjqG3uwPXXQkb652645Gdde3dGGBUt9mjmEyrjLcnVDbNahEp4ZFrweLgvGGw== X-Received: by 2002:a7b:ca4a:0:b0:3ea:e582:48dd with SMTP id m10-20020a7bca4a000000b003eae58248ddmr23145889wml.34.1680387648143; Sat, 01 Apr 2023 15:20:48 -0700 (PDT) Original-Received: from localhost ([109.78.116.250]) by smtp.gmail.com with ESMTPSA id p12-20020a05600c358c00b003ef6f87118dsm14810888wmq.42.2023.04.01.15.20.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Apr 2023 15:20:47 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=contovob@tcd.ie; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:259076 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Byte-compiling ibuf-ext.el currently emits the following warning: In ibuffer-diff-buffer-with-file-1: ibuf-ext.el:1660:8: Warning: =E2=80=98unwind-protect=E2=80=99 without unw= ind forms Trying out ibuffer-diff-with-file, I also see some undesirable behaviour: 0. emacs -Q 1. M-x find-library RET ibuf-ext RET 2. C-o 3. M-x find-library RET ibuffer RET 4. C-o 5. M-x ibuffer RET 6. * u =3D The resulting *Ibuffer Diff* buffer opens with two empty lines and point on the second, and closes with two 'Diff finished' sentinel lines. The attached patch fixes these issues, bringing ibuffer-diff-with-file more in line with its apparent inspiration, diff-buffer-with-file. WDYT? BTW, just curious: why is diff-command called through the shell in diff-no-select (and ibuffer-diff-with-file), rather than directly? Thanks, --=20 Basil --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Improve-ibuffer-diff-with-file.patch >From 9d6d39c237bbe4a4cb333d1258b4e732988ee8e0 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Sat, 1 Apr 2023 15:14:34 +0100 Subject: [PATCH] Improve ibuffer-diff-with-file * lisp/ibuf-ext.el (ibuffer-diff-with-file): Link to diff-command in docstring. Make Diff buffer read-only from outset and inhibit as needed to avoid surprises. Check whether diff-command supports --label. Leave point at BOB and clean up any excess newline inserted by ibuffer-diff-buffer-with-file-1. Prefer pop-to-buffer-same-window over switch-to-buffer. (ibuffer-diff-buffer-with-file-1): Add docstring. Remove unused unwind-protect and copypasta from diff-no-select. Use diff-file-local-copy, string-join, and redisplay in place of analogues. Condition --label use on availability, and label buffers consistently with diff-no-select. Leave empty line between runs. Let diff-sentinel delete temporary files. Leave point at EOB for next run. --- lisp/ibuf-ext.el | 93 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index ed4c8a04db7..550b5ed0e6a 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1650,68 +1650,67 @@ ibuffer-jump-to-buffer (error "No buffer with name %s" name) (goto-char buf-point))))) +(declare-function diff-check-labels "diff" (&optional force)) +(declare-function diff-file-local-copy "diff" (file-or-buf)) (declare-function diff-sentinel "diff" (code &optional old-temp-file new-temp-file)) (defun ibuffer-diff-buffer-with-file-1 (buffer) - (let ((bufferfile (buffer-local-value 'buffer-file-name buffer)) - (tempfile (make-temp-file "buffer-content-"))) - (when bufferfile - (unwind-protect - (progn - (with-current-buffer buffer - (write-region nil nil tempfile nil 'nomessage)) - (let* ((old (expand-file-name bufferfile)) - (new (expand-file-name tempfile)) - (oldtmp (file-local-copy old)) - (newtmp (file-local-copy new)) - (switches diff-switches) - (command - (mapconcat - 'identity - `(,diff-command - ;; Use explicitly specified switches - ,@(if (listp switches) switches (list switches)) - ,@(if (or old new) - (list "-L" (shell-quote-argument old) - "-L" (shell-quote-argument - (format "Buffer %s" (buffer-name buffer))))) - ,(shell-quote-argument (or oldtmp old)) - ,(shell-quote-argument (or newtmp new))) - " "))) - (let ((inhibit-read-only t)) - (insert command "\n") - (diff-sentinel - (call-process shell-file-name nil - (current-buffer) nil - shell-command-switch command)) - (insert "\n"))))) - (sit-for 0) - (when (file-exists-p tempfile) - (delete-file tempfile))))) + "Compare BUFFER with its associated file, if any. +Unlike `diff-no-select', insert output into current buffer +without erasing it." + (when-let ((old (buffer-file-name buffer))) + (defvar diff-use-labels) + (let* ((new buffer) + (oldtmp (diff-file-local-copy old)) + (newtmp (diff-file-local-copy new)) + (switches diff-switches) + (command + (string-join + `(,diff-command + ,@(if (listp switches) switches (list switches)) + ,@(and (eq diff-use-labels t) + (list "--label" (shell-quote-argument old) + "--label" (shell-quote-argument (format "%S" new)))) + ,(shell-quote-argument (or oldtmp old)) + ,(shell-quote-argument (or newtmp new))) + " ")) + (inhibit-read-only t)) + (insert ?\n command ?\n) + (diff-sentinel (call-process shell-file-name nil t nil + shell-command-switch command) + oldtmp newtmp) + (goto-char (point-max))) + (redisplay))) ;;;###autoload (defun ibuffer-diff-with-file () "View the differences between marked buffers and their associated files. If no buffers are marked, use buffer at point. -This requires the external program \"diff\" to be in your `exec-path'." +This requires the external program `diff-command' to be in your +`exec-path'." (interactive) (require 'diff) - (let ((marked-bufs (ibuffer-get-marked-buffers))) - (when (null marked-bufs) - (setq marked-bufs (list (ibuffer-current-buffer t)))) - (with-current-buffer (get-buffer-create "*Ibuffer Diff*") - (setq buffer-read-only nil) - (buffer-disable-undo (current-buffer)) - (erase-buffer) - (buffer-enable-undo (current-buffer)) + (let ((marked-bufs (or (ibuffer-get-marked-buffers) + (list (ibuffer-current-buffer t)))) + (diff-buf (get-buffer-create "*Ibuffer Diff*"))) + (with-current-buffer diff-buf + (setq buffer-read-only t) + (buffer-disable-undo) + (let ((inhibit-read-only t)) + (erase-buffer)) + (buffer-enable-undo) (diff-mode) + (diff-check-labels) (dolist (buf marked-bufs) (unless (buffer-live-p buf) (error "Buffer %s has been killed" buf)) - (ibuffer-diff-buffer-with-file-1 buf)) - (setq buffer-read-only t))) - (switch-to-buffer "*Ibuffer Diff*")) + (ibuffer-diff-buffer-with-file-1 buf)) + (goto-char (point-min)) + (when (= (following-char) ?\n) + (let ((inhibit-read-only t)) + (delete-char 1)))) + (pop-to-buffer-same-window diff-buf))) ;;;###autoload (defun ibuffer-copy-filename-as-kill (&optional arg) -- 2.39.2 --=-=-= Content-Type: text/plain In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars) of 2023-04-01 built on tia Repository revision: 626f2f744104bc14c28456134cf75ff2f16d9901 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101007 System Description: Debian GNU/Linux 12 (bookworm) Configured using: 'configure 'CFLAGS=-Og -ggdb3' -C --prefix=/home/blc/.local --enable-checking=structs --with-file-notification=yes --with-x-toolkit=lucid --with-x' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XAW3D XDBE XIM XINPUT2 XPM LUCID ZLIB Important settings: value of $LANG: en_IE.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 36572 9347) (symbols 48 5171 0) (strings 32 13854 1584) (string-bytes 1 377429) (vectors 16 9294) (vector-slots 8 148577 13143) (floats 8 23 25) (intervals 56 245 0) (buffers 984 10)) --=-=-=--