GNU bug report logs - #62599
30.0.50; Improve ibuffer-diff-with-file

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 62599 in the body.
You can then email your comments to 62599 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Basil L. Contovounesios" <contovob <at> tcd.ie>
To: bug-gnu-emacs <at> gnu.org
Subject: 30.0.50; Improve ibuffer-diff-with-file
Date: Sat, 01 Apr 2023 23:20:46 +0100

[Message part 1 (text/plain, inline)]

Byte-compiling ibuf-ext.el currently emits the following warning:

  In ibuffer-diff-buffer-with-file-1:
  ibuf-ext.el:1660:8: Warning: ‘unwind-protect’ without unwind 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 =

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,

-- 
Basil

[0001-Improve-ibuffer-diff-with-file.patch (text/x-diff, attachment)]

[Message part 3 (text/plain, inline)]

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

Message #14 received at 62599 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattiase <at> acm.org>
To: "Basil L. Contovounesios" <contovob <at> tcd.ie>
Cc: 62599 <at> debbugs.gnu.org
Subject: bug#62599: 30.0.50; Improve ibuffer-diff-with-file
Date: Sun, 2 Apr 2023 10:24:52 +0200

Thank you -- I'm no buffer expert but see no obvious flaws.

`verilog-diff-file-with-buffer` in verilog-mode.el looks vaguely similar, down to the dodgy unwind-protect, but it has stronger compatibility requirements so it probably can't use more recent diff machinery.

Message #17 received at 62599 <at> debbugs.gnu.org (full text, mbox):

From: Mattias Engdegård <mattiase <at> acm.org>
To: "Basil L. Contovounesios" <contovob <at> tcd.ie>
Cc: 62599 <at> debbugs.gnu.org
Subject: Re: bug#62599: 30.0.50; Improve ibuffer-diff-with-file
Date: Sun, 2 Apr 2023 15:31:25 +0200

> Thank you -- I'm no buffer expert but see no obvious flaws.

(No obvious flaws with your patch, that is.)

Message #20 received at 62599 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Mattias Engdegård <mattiase <at> acm.org>
Cc: 62599 <at> debbugs.gnu.org
Subject: Re: bug#62599: 30.0.50; Improve ibuffer-diff-with-file
Date: Sun, 02 Apr 2023 17:44:09 +0100

Mattias Engdegård [2023-04-02 10:24 +0200] wrote:

> Thank you -- I'm no buffer expert but see no obvious flaws.

Thanks for reviewing.  I'll wait a few more days for comments before
pushing.

> `verilog-diff-file-with-buffer` in verilog-mode.el looks vaguely
> similar, down to the dodgy unwind-protect, but it has stronger
> compatibility requirements so it probably can't use more recent diff
> machinery.

Oh, that reminded me that call-process has a DISPLAY parameter.  I guess
in ibuffer-diff-buffer-with-file-1 we're still interested in calling
redisplay after diff-sentinel, though:

Basil L. Contovounesios [2023-04-01 23:20 +0100] wrote:

> +      (diff-sentinel (call-process shell-file-name nil t nil
> +                                   shell-command-switch command)
> +                     oldtmp newtmp)
> +      (goto-char (point-max)))
> +    (redisplay)))

I opened https://bugs.gnu.org/62620 for the Verilog case.

Thanks,

-- 
Basil

Message #23 received at 62599 <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Mattias Engdegård <mattiase <at> acm.org>
Cc: 62599 <at> debbugs.gnu.org
Subject: Re: bug#62599: 30.0.50; Improve ibuffer-diff-with-file
Date: Sun, 02 Apr 2023 17:45:01 +0100

Mattias Engdegård [2023-04-02 15:31 +0200] wrote:

>> Thank you -- I'm no buffer expert but see no obvious flaws.
>
> (No obvious flaws with your patch, that is.)

Good - I try to keep my obvious character flaws out of my patches ;).

-- 
Basil

Message #28 received at 62599-done <at> debbugs.gnu.org (full text, mbox):

From: Basil Contovounesios <contovob <at> tcd.ie>
To: Mattias Engdegård <mattiase <at> acm.org>
Cc: 62599-done <at> debbugs.gnu.org
Subject: Re: bug#62599: 30.0.50; Improve ibuffer-diff-with-file
Date: Sat, 08 Apr 2023 11:56:18 +0100

close 62599 30.1
quit

Basil Contovounesios [2023-04-02 17:44 +0100] wrote:

> Mattias Engdegård [2023-04-02 10:24 +0200] wrote:
>
>> Thank you -- I'm no buffer expert but see no obvious flaws.
>
> Thanks for reviewing.  I'll wait a few more days for comments before
> pushing.

Done and closing.

Improve ibuffer-diff-with-file
10b58633b56 2023-04-08 11:51:43 +0100
https://git.sv.gnu.org/cgit/emacs.git/commit/?id=10b58633b56

Thanks,

-- 
Basil

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.