From: Phil Sainty <psainty@orcon.net.nz>
Date: Sat, 11 Jul 2020 07:40:27 +0000 (+1200)
Subject: ; lisp/so-long.el: Prevent potential error if comment-use-syntax is nil
X-Git-Tag: emacs-27.1~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8576297b2a657d1944b7d824b30a1cb6459685c6;p=emacs.git

; lisp/so-long.el: Prevent potential error if comment-use-syntax is nil

* lisp/so-long.el (so-long-detected-long-line-p): Ensure that
`comment-start-skip' and `comment-end-skip' are both set if
`comment-use-syntax' is nil, as `comment-forward' requires them
to be bound in this scenario.
---

diff --git a/lisp/so-long.el b/lisp/so-long.el
index 21dc7de75c8..1332ae12633 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -1047,7 +1047,9 @@ This is the default value of `so-long-predicate'."
   (let ((count 0) start)
     (save-excursion
       (goto-char (point-min))
-      (when so-long-skip-leading-comments
+      (when (and so-long-skip-leading-comments
+                 (or comment-use-syntax ;; Refer to `comment-forward'.
+                     (and comment-start-skip comment-end-skip)))
         ;; Skip the shebang line, if any.  This is not necessarily comment
         ;; syntax, so we need to treat it specially.
         (when (looking-at "#!")