From: Stefan Monnier Date: Wed, 21 Nov 2001 02:05:29 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: emacs-21.2~275 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32dfb713bf2036fcd5d49bd524dd6f83c37b1c1c;p=emacs.git *** empty log message *** --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 326a921f284..8a629d421c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-11-20 Stefan Monnier + + * progmodes/tcl.el (tcl-indent-for-comment): Handle the case where + `comment-indent-function' returns nil. + 2001-11-20 Jason Rumney * w32-fns.el (w32-system-coding-system): Initialize from diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index b45b63907d8..2947b7acaf6 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -6,7 +6,7 @@ ;; Author: Tom Tromey ;; Chris Lindblad ;; 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 ") ;; @@ -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))))