From dc239872cc248414f121e0455d447ef00f9b4cc4 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 17 May 2022 11:48:12 +0200 Subject: [PATCH] Fix package-quickstart breakage * lisp/emacs-lisp/package.el (package-quickstart-refresh): Work around syntax-ppss now clobbering match data (but it's not clear whether that's supposed to be allowed) (bug#55447). --- lisp/emacs-lisp/package.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f356a2bf603..3a05005fb57 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -4288,7 +4288,7 @@ activations need to be changed, such as when `package-load-list' is modified." (insert-file-contents file) ;; Fixup the special #$ reader form and throw away comments. (while (re-search-forward "#\\$\\|^;\\(.*\n\\)" nil 'move) - (unless (nth 8 (syntax-ppss)) + (unless (ppss-string-terminator (save-match-data (syntax-ppss))) (replace-match (if (match-end 1) "" pfile) t t))) (unless (bolp) (insert "\n")) (insert ")\n"))) -- 2.39.2