XEmacs 21.2.39 "Millennium".

[chise/xemacs-chise.git.1] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index 51cc77d..38fd6fa 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2544,7 +2544,8 @@ If nil, use `comment-end' instead."
   :group 'fill-comments)
 
 (defun indent-for-comment ()
-  "Indent this line's comment to comment column, or insert an empty comment."
+  "Indent this line's comment to comment column, or insert an empty
+comment.  Comments starting in column 0 are not moved."
   (interactive "*")
   (let* ((empty (save-excursion (beginning-of-line)
                                (looking-at "[ \t]*$")))
@@ -2571,13 +2572,19 @@ If nil, use `comment-end' instead."
                     (skip-syntax-backward "^ " (match-beginning 0)))))
        (setq begpos (point))
        ;; Compute desired indent.
-       (if (= (current-column)
-              (setq indent (funcall comment-indent-function)))
-           (goto-char begpos)
+        ;; XEmacs change: Preserve indentation of comments starting in
+        ;; column 0, as documented.
+       (cond
+        ((= (current-column) 0)
+         (goto-char begpos))
+        ((= (current-column)
+            (setq indent (funcall comment-indent-function)))
+         (goto-char begpos))
+        (t
          ;; If that's different from current, change it.
          (skip-chars-backward " \t")
          (delete-region (point) begpos)
-         (indent-to indent))
+         (indent-to indent)))
        ;; An existing comment?
        (if cpos
            (progn (goto-char cpos)