summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRobert Pluim <rpluim@gmail.com>2023-05-04 14:07:08 +0200
committerRobert Pluim <rpluim@gmail.com>2023-05-04 16:03:13 +0200
commit94e984e6700c805c3aaac6f8d9c56381a8d0673a (patch)
tree4d0e9cad3de4e840ee3db77363a2a09255274ce4 /lisp
parentaba41d2c4bb4a47e2953231044f5a998ab37d82e (diff)
downloademacs-94e984e6700c805c3aaac6f8d9c56381a8d0673a.tar.gz
Make loaddefs-generate slightly more tolerant
There are packages in the wild, such as vlf-20191126.2250, which have entries that are not terminated by three ';', but by two. Tolerate such entries. * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Search for two ';' as a delimiter, not three. (Bug#63236)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/loaddefs-gen.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index a966b1e9f40..2a46fb7a022 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -635,9 +635,12 @@ instead of just updating them with the new/changed autoloads."
(progn
(goto-char (point-max))
(search-backward "\f\n" nil t))
- ;; Delete the old version of the section.
+ ;; Delete the old version of the section. Strictly
+ ;; speaking this should search for "\n\f\n;;;", but
+ ;; there are loaddefs files in the wild that only
+ ;; have two ';;'. (Bug#63236)
(delete-region (match-beginning 0)
- (and (search-forward "\n\f\n;;;")
+ (and (search-forward "\n\f\n;;")
(match-beginning 0)))
(forward-line -2)))
(insert head)