aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2001-11-13 20:19:22 +0000
committerStefan Monnier2001-11-13 20:19:22 +0000
commit9145f1c236625f8fab15e7ea032c11e666487d66 (patch)
tree2f299d48149459bb34e786859a409d19c48f5f66
parentb3700ae76d50437c1b970bdcdcd2d7488bfcb1cb (diff)
downloademacs-9145f1c236625f8fab15e7ea032c11e666487d66.tar.gz
emacs-9145f1c236625f8fab15e7ea032c11e666487d66.zip
(comment-normalize-vars): Handle a nil comment-padding.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/newcomment.el3
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d928502e28..b9ae96a0d8e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
5 5
62001-11-13 Stefan Monnier <monnier@cs.yale.edu> 62001-11-13 Stefan Monnier <monnier@cs.yale.edu>
7 7
8 * newcomment.el (comment-normalize-vars): Handle a nil comment-padding.
9
8 * progmodes/ada-mode.el (ada-fill-comment-prefix): GNAT wants 2 spaces. 10 * progmodes/ada-mode.el (ada-fill-comment-prefix): GNAT wants 2 spaces.
9 From Emmanuel Briot <briot@act-europe.fr>. 11 From Emmanuel Briot <briot@act-europe.fr>.
10 12
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index ecef1c7b182..fe43618ba73 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -5,7 +5,7 @@
5;; Author: code extracted from Emacs-20's simple.el 5;; Author: code extracted from Emacs-20's simple.el
6;; Maintainer: Stefan Monnier <monnier@cs.yale.edu> 6;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
7;; Keywords: comment uncomment 7;; Keywords: comment uncomment
8;; Revision: $Id: newcomment.el,v 1.36 2001/10/11 01:44:48 monnier Exp $ 8;; Revision: $Id: newcomment.el,v 1.37 2001/10/12 22:37:51 monnier Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -220,6 +220,7 @@ This is obsolete because you might as well use \\[newline-and-indent]."
220 (goto-char (point-min)) 220 (goto-char (point-min))
221 (and (forward-comment 1) (eobp)))))) 221 (and (forward-comment 1) (eobp))))))
222 ;; comment-padding 222 ;; comment-padding
223 (unless comment-padding (setq comment-padding 0))
223 (when (integerp comment-padding) 224 (when (integerp comment-padding)
224 (setq comment-padding (make-string comment-padding ? ))) 225 (setq comment-padding (make-string comment-padding ? )))
225 ;; comment markers 226 ;; comment markers