bug#54218: [PATCH] Magic number regexp shouldn't match beyond end-of-line.

bug#54218: [PATCH] Magic number regexp shouldn't match beyond end-of-line.

[Andrew L. Moore]

Repeat magic number search to work around match-data loss
when `save-window-excursion' is called.
---
  lisp/progmodes/executable.el | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index d7c093444e..9116bdea9d 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -232,7 +232,8 @@ executable-set-magic
        (save-excursion
         (goto-char (point-min))
         (add-hook 'after-save-hook 'executable-chmod nil t)
-       (if (looking-at "#![ \t]*\\(.*\\)$")
+        ;; Regexp shouldn't match beyond end-of-line.
+       (if (looking-at "#![ \t]*\\([^\n]*\\)$")
             (and (goto-char (match-beginning 1))
                  ;; If the line ends in a space,
                  ;; don't offer to change it.
@@ -247,8 +248,13 @@ executable-set-magic
                                       "Replace magic number by `#!%s'? "
                                       argument))))
                      (progn
-                      (replace-match argument t t nil 1)
-                      (message "Magic number changed to `#!%s'" 
argument))))
+                       ;; Repeat search to work around match-data loss
+                       ;; from call to `save-window-excursion' above.
+                       (goto-char (point-min))
+                       (if (looking-at "^#![ \t]*\\([^\n]*\\)$")
+                           (progn
+                            (replace-match argument t t nil 1)
+                            (message "Magic number changed to `#!%s'" 
argument))))))
           (insert "#!" argument ?\n)
           (message "Magic number changed to `#!%s'" argument))))
      interpreter)
-- 

bug#54218: [PATCH] Magic number regexp shouldn't match beyond end-of-line.

[Andreas Schwab]

On Mär 01 2022, Andrew L. Moore wrote:

> diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
> index d7c093444e..9116bdea9d 100644
> --- a/lisp/progmodes/executable.el
> +++ b/lisp/progmodes/executable.el
> @@ -232,7 +232,8 @@ executable-set-magic
>         (save-excursion
>          (goto-char (point-min))
>          (add-hook 'after-save-hook 'executable-chmod nil t)
> -       (if (looking-at "#![ \t]*\\(.*\\)$")
> +        ;; Regexp shouldn't match beyond end-of-line.
> +       (if (looking-at "#![ \t]*\\([^\n]*\\)$")

In Emacs regexps, `.' doesn't match newlines.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

bug#54218: [PATCH] Magic number regexp shouldn't match beyond end-of-line.

[Lars Ingebrigtsen]

"Andrew L. Moore" <slewsys@gmail.com> writes:

> Repeat magic number search to work around match-data loss
> when `save-window-excursion' is called.

I think it would perhaps make more sense to just save the match data
instead of repeating the match, so I've now done so in Emacs 29

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#54218: [PATCH] Magic number regexp shouldn't match beyond end-of-line.

[Andrew L. Moore]

On 3/3/22 09:42, Lars Ingebrigtsen wrote:
> "Andrew L. Moore" <slewsys@gmail.com> writes:
> 
>> Repeat magic number search to work around match-data loss
>> when `save-window-excursion' is called.
> 
> I think it would perhaps make more sense to just save the match data
> instead of repeating the match, so I've now done so in Emacs 29

Yes, this resolves the issues that I was seeing.

For the record, I'm not able to reproduce the data loss with
vanilla Emacs by calling `executable-set-magic' manually.  It
occurs (for me) when `executable-set-magic' is called automatically
from a minor mode.  In any case, your patch fixes my minor mode
and does no harm.

The other issue that I attributed to the regexp matching beyond
EOL was caused by `replace-match' being called by incorrect or
uninitialized match data.  Your patch resolves this as well.
Thank you!

bug#54218: [PATCH] Magic number regexp shouldn't match beyond end-of-line.

[Lars Ingebrigtsen]

"Andrew L. Moore" <slewsys@gmail.com> writes:

> The other issue that I attributed to the regexp matching beyond
> EOL was caused by `replace-match' being called by incorrect or
> uninitialized match data.  Your patch resolves this as well.

Thanks for checking.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no