From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 17 May 2022 09:48:12 +0000 (+0200)
Subject: Fix package-quickstart breakage
X-Git-Tag: emacs-29.0.90~1910^2~633
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc239872cc248414f121e0455d447ef00f9b4cc4;p=emacs.git

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

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