From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 25 Nov 2003 21:20:51 +0000 (+0000)
Subject: (comment-normalize-vars): Initialize properly if comment-start was nil.
X-Git-Tag: ttn-vms-21-2-B4~8272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d6a08f64d55dc50d7364128286d06b63578e603;p=emacs.git

(comment-normalize-vars): Initialize properly if comment-start was nil.
---

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index fb2cf480c0d..7bd4465c9f2 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -224,10 +224,10 @@ terminated by the end of line (i.e. `comment-end' is empty)."
 Functions autoloaded from newcomment.el, being entry points, should call
 this function before any other, so the rest of the code can assume that
 the variables are properly set."
-  (if (not comment-start)
-      (unless noerror
-	(set (make-local-variable 'comment-start)
-	     (read-string "No comment syntax is defined.  Use: ")))
+  (unless (and (not comment-start) noerror)
+    (unless comment-start
+      (set (make-local-variable 'comment-start)
+	   (read-string "No comment syntax is defined.  Use: ")))
     ;; comment-use-syntax
     (when (eq comment-use-syntax 'undecided)
       (set (make-local-variable 'comment-use-syntax)