From b75c18f3c6c8d347d4f1a9cce746e673d91997a9 Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Thu, 17 Apr 2025 16:17:12 -0700 Subject: [PATCH] Make sure prog-fill-reindent-defun work for strings too My previous commit foolishly excluded strings from the condition, now add them back. * lisp/progmodes/prog-mode.el (prog-fill-reindent-defun): Include strings. --- lisp/progmodes/prog-mode.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index 4e9e228fa9c..62d22cb78c0 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -154,7 +154,7 @@ or follows point." ;; FIXME: For some reason, the comment-start syntax regexp doesn't ;; work for me. But I kept it around to be safe, and in the hope ;; that if can cover cases where comment-start-skip is unset. - (if (or (nth 4 (syntax-ppss)) + (if (or (nth 8 (syntax-ppss)) ;; If point is at the beginning of a comment delimiter, ;; syntax-ppss doesn't consider point as being inside a ;; comment. @@ -168,11 +168,11 @@ or follows point." ;; reached EOL or (nth 4 (syntax-ppss)) returns ;; non-nil. (re-search-forward comment-start-skip (pos-eol) t) - (nth 4 (syntax-ppss)))) + (nth 8 (syntax-ppss)))) (save-excursion (beginning-of-line) (and (re-search-forward "\\s-*\\s<" (line-end-position) t) - (nth 4 (syntax-ppss))))) + (nth 8 (syntax-ppss))))) (fill-paragraph argument (region-active-p)) (beginning-of-defun) (let ((start (point)))