Package: emacs;
Reported by: John Ciolfi <ciolfi <at> mathworks.com>
Date: Sat, 8 Mar 2025 06:10:02 UTC
Severity: normal
Tags: patch
Found in version 29.4
Done: Harald Jörg <haj <at> posteo.de>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Harald Jörg <haj <at> posteo.de> To: Stefan Kangas <stefankangas <at> gmail.com> Cc: John Ciolfi <ciolfi <at> mathworks.com>, 76851 <at> debbugs.gnu.org Subject: bug#76851: 29.4; cperl-mode builtin fcn indent bug and fix Date: Sat, 08 Mar 2025 09:48:35 +0000
Stefan Kangas <stefankangas <at> gmail.com> writes:
> John Ciolfi via "Bug reports for GNU Emacs, the Swiss army knife of text
> editors" <bug-gnu-emacs <at> gnu.org> writes:
>
>> Hi
>>
>> Given this perl file:
>>
>> sub test {
>> exec '/bin/echo',
>> 'Your arguments are: ', @ARGV;
>> }
>>
>> sub exec_fcn {
>> }
>>
>> sub other {
>> }
>>
>> The 'sub other' is indented incorrectly (and all code following it).
>>
>> The fix is in cperl-after-block-and-statement-beg to not match exec_, i.e. we should
>> not treat exec_fcn as a builtin. Attached is the fix.
>
> Harald, any comments on this patch?
Yes :)
I confirm this is a bug, and one of those nasty ones which affect all
following code.
I suggest a slightly improved patch. Instead of replacing \> (end of
word) by [[:space:]] it should be replaced by \_> (end of symbol).
A space is not required after the keywords in the list. In the case of
exec, this is handled elsewhere, but there are keywords in the list
where it matters.
With [[:space:]], the following indentation happens:
my %h = map{$_=>1}
@ARGV;
With \_>, @ARGV is correctly indented as a continuation line:
my %h = map{$_=>1}
@ARGV;
This is less severe than the bug reported because it does not affect
following code, but still should not happen.
>
>>
>> Thanks,
>> John
>>
>> --- a/cperl-mode.el
>> +++ b/cperl-mode.el
>> @@ -5606,8 +5606,16 @@ Do not look before LIM."
>> (progn
>> (forward-sexp -1)
>> (not
>> + ;; Used to indent functions like:
>> + ;; exec 'prog',
>> + ;; @ARGS;
>> + ;; [[:space:]] means we will not match exec_fcn and 'sub other' is indented correctly:
>> + ;; sub exec_fcn {
>> + ;; }
>> + ;; sub other {
>> + ;; }
>> (looking-at
>> - "\\(map\\|grep\\|say\\|printf?\\|system\\|exec\\|tr\\|s\\)\\>")))))))
>> + "\\(map\\|grep\\|say\\|printf?\\|system\\|exec\\|tr\\|s\\)[[:space:]]")))))))
>>
>>
>> (defun cperl-indent-exp ()
>>
>> In GNU Emacs 29.4 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.38,
>> cairo version 1.16.0) of 2024-07-22, modified by Debian built on
>> x86-ubc-01
>> Windowing system distributor 'The X.Org Foundation', version 11.0.12101006
>> System Description: Debian GNU/Linux 12 (bookworm)
>>
>> Configured using:
>> 'configure --build x86_64-linux-gnu --prefix=/usr
>> --sharedstatedir=/var/lib --libexecdir=/usr/libexec
>> --localstatedir=/var/lib --infodir=/usr/share/info
>> --mandir=/usr/share/man --with-libsystemd --with-pop=yes
>> --enable-locallisppath=/etc/emacs:/usr/local/share/emacs/29.4/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/29.4/site-lisp:/usr/share/emacs/site-lisp
>> --with-sound=alsa --without-gconf --with-mailutils
>> --with-native-compilation --build x86_64-linux-gnu --prefix=/usr
>> --sharedstatedir=/var/lib --libexecdir=/usr/libexec
>> --localstatedir=/var/lib --infodir=/usr/share/info
>> --mandir=/usr/share/man --with-libsystemd --with-pop=yes
>> --enable-locallisppath=/etc/emacs:/usr/local/share/emacs/29.4/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/29.4/site-lisp:/usr/share/emacs/site-lisp
>> --with-sound=alsa --without-gconf --with-mailutils
>> --with-native-compilation --with-cairo --with-x=yes
>> --with-x-toolkit=gtk3 --with-toolkit-scroll-bars 'CFLAGS=-g -O2
>> -ffile-prefix-map=/build/reproducible-path/emacs-29.4+1=. -fstack-protector-strong
>> -Wformat -Werror=format-security -Wall' 'CPPFLAGS=-Wdate-time
>> -D_FORTIFY_SOURCE=2' LDFLAGS=-Wl,-z,relro'
>>
>> Configured features:
>> ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
>> JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES
>> NATIVE_COMP NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3
>> THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XDBE XIM XINPUT2
>> XPM GTK3 ZLIB
>>
>> Important settings:
>> value of $LANG: en_US.UTF-8
>> locale-coding-system: utf-8-unix
>>
>> Major mode: Fundamental
>>
>> Minor modes in effect:
>> tooltip-mode: t
>> global-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
>> blink-cursor-mode: t
>> buffer-read-only: 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 mm-decode mm-bodies
>> mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail
>> rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils comp comp-cstr
>> warnings subr-x rx cl-seq cl-macs gv cl-extra help-mode bytecomp
>> byte-compile cus-edit pp cus-start cus-load icons wid-edit cl-loaddefs
>> cl-lib 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 move-toolbar gtk x-toolkit xinput2 x multi-tty
>> make-network-process native-compile emacs)
>>
>> Memory information:
>> ((conses 16 105675 8530)
>> (symbols 48 8853 7)
>> (strings 32 23487 2243)
>> (string-bytes 1 691014)
>> (vectors 16 17555)
>> (vector-slots 8 353713 18074)
>> (floats 8 39 42)
>> (intervals 56 579 2)
>> (buffers 984 14))
--
Cheers,
haj
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.