*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 326a921f284faf2c7e620303a6f442c0857952a1..8a629d421c8bcf42ffc4e1170fe69fdadfde314a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-20  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * progmodes/tcl.el (tcl-indent-for-comment): Handle the case where
+       `comment-indent-function' returns nil.
+
 2001-11-20  Jason Rumney  <jasonr@gnu.org>
 
        * w32-fns.el (w32-system-coding-system): Initialize from

diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index b45b63907d8f6fa79463653be1a99cb3ebd992dd..2947b7acaf60aff10dac89db603a916f4644aebc 100644 (file)
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -6,7 +6,7 @@
 ;; Author: Tom Tromey <tromey@busco.lanl.gov>
 ;;    Chris Lindblad <cjl@lcs.mit.edu>
 ;; Keywords: languages tcl modes
-;; Version: $Revision: 1.63 $
+;; Version: $Revision: 1.64 $
 
 ;; This file is part of GNU Emacs.
 
@@ -132,7 +132,7 @@
           (require 'imenu))
        ()))
 
-(defconst tcl-version "$Revision: 1.63 $")
+(defconst tcl-version "$Revision: 1.64 $")
 (defconst tcl-maintainer "Tom Tromey <tromey@drip.colorado.edu>")
 
 ;;
@@ -1877,7 +1877,7 @@ Parts of this were taken from `indent-for-comment'."
                (backward-char))))))
   ;; Point is just after the "#" starting a comment.  Move it as
   ;; appropriate.
-  (let* ((indent (funcall comment-indent-function))
+  (let* ((indent (or (funcall comment-indent-function) comment-column))
         (begpos (progn
                   (backward-char)
                   (point))))