Mercurial > emacs
comparison lisp/newcomment.el @ 90199:bb71c6cf2009
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-67
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 447-458)
- Update from CVS
- Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 83-85)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 30 Jun 2005 00:31:46 +0000 |
parents | f042e7c0fe20 5448f90c05f7 |
children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
90198:97f6c3a96df1 | 90199:bb71c6cf2009 |
---|---|
500 "Default for `comment-indent-function'." | 500 "Default for `comment-indent-function'." |
501 (if (and (looking-at "\\s<\\s<\\(\\s<\\)?") | 501 (if (and (looking-at "\\s<\\s<\\(\\s<\\)?") |
502 (or (match-end 1) (/= (current-column) (current-indentation)))) | 502 (or (match-end 1) (/= (current-column) (current-indentation)))) |
503 0 | 503 0 |
504 (when (or (/= (current-column) (current-indentation)) | 504 (when (or (/= (current-column) (current-indentation)) |
505 (and (> comment-add 0) (looking-at "\\s<\\S<"))) | 505 (and (> comment-add 0) (looking-at "\\s<\\(\\S<\\|\\'\\)"))) |
506 comment-column))) | 506 comment-column))) |
507 | 507 |
508 ;;;###autoload | 508 ;;;###autoload |
509 (defun comment-indent (&optional continue) | 509 (defun comment-indent (&optional continue) |
510 "Indent this line's comment to `comment-column', or insert an empty comment. | 510 "Indent this line's comment to `comment-column', or insert an empty comment. |