diff options
| author | Stefan Monnier | 2000-05-22 04:24:01 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2000-05-22 04:24:01 +0000 |
| commit | 4125ec7e79f8f95f42cce9ff080f23ebd90b0ae9 (patch) | |
| tree | 11db41ee7cd7bb0bf896af54da2c1bb1c4ced97e | |
| parent | adee4f912ad6593dc92dd04ea1f8e0f9ef315ccb (diff) | |
| download | emacs-4125ec7e79f8f95f42cce9ff080f23ebd90b0ae9.tar.gz emacs-4125ec7e79f8f95f42cce9ff080f23ebd90b0ae9.zip | |
(comment-region-internal): Go back to BEG after quoting
the nested comment markers.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/newcomment.el | 19 |
2 files changed, 20 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 159a64ed380..737524baa43 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | 2000-05-21 Stefan Monnier <monnier@cs.yale.edu> | 1 | 2000-05-22 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | |||
| 3 | * newcomment.el (comment-region-internal): Go back to BEG after quoting | ||
| 4 | the nested comment markers. | ||
| 2 | 5 | ||
| 3 | * subr.el (remove-hook): Don't turn the hook's value into a list. | 6 | * subr.el (remove-hook): Don't turn the hook's value into a list. |
| 4 | 7 | ||
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 223eb5f3ee3..f73b6961888 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el | |||
| @@ -6,7 +6,7 @@ | |||
| 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 | ;; Version: $Name: $ | 8 | ;; Version: $Name: $ |
| 9 | ;; Revision: $Id: newcomment.el,v 1.11 2000/05/19 15:37:41 monnier Exp $ | 9 | ;; Revision: $Id: newcomment.el,v 1.12 2000/05/21 00:27:31 monnier Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -664,8 +664,8 @@ indentation to be kept as it was before narrowing." | |||
| 664 | (defun comment-region-internal (beg end cs ce | 664 | (defun comment-region-internal (beg end cs ce |
| 665 | &optional ccs cce block lines indent) | 665 | &optional ccs cce block lines indent) |
| 666 | "Comment region BEG..END. | 666 | "Comment region BEG..END. |
| 667 | CS and CE are the comment start resp. end string. | 667 | CS and CE are the comment start resp end string. |
| 668 | CCS and CCE are the comment continuation strings for the start resp. end | 668 | CCS and CCE are the comment continuation strings for the start resp end |
| 669 | of lines (default to CS and CE). | 669 | of lines (default to CS and CE). |
| 670 | BLOCK indicates that end of lines should be marked with either CCE, CE or CS | 670 | BLOCK indicates that end of lines should be marked with either CCE, CE or CS |
| 671 | \(if CE is empty) and that those markers should be aligned. | 671 | \(if CE is empty) and that those markers should be aligned. |
| @@ -702,6 +702,7 @@ rather than at left margin." | |||
| 702 | (comment-quote-nested comment-start comment-end nil) | 702 | (comment-quote-nested comment-start comment-end nil) |
| 703 | 703 | ||
| 704 | ;; Loop over all lines to find the needed indentations. | 704 | ;; Loop over all lines to find the needed indentations. |
| 705 | (goto-char (point-min)) | ||
| 705 | (while | 706 | (while |
| 706 | (progn | 707 | (progn |
| 707 | (unless (looking-at "[ \t]*$") | 708 | (unless (looking-at "[ \t]*$") |
| @@ -938,6 +939,18 @@ unless optional argument SOFT is non-nil." | |||
| 938 | 939 | ||
| 939 | ;;; Change Log: | 940 | ;;; Change Log: |
| 940 | ;; $Log: newcomment.el,v $ | 941 | ;; $Log: newcomment.el,v $ |
| 942 | ;; Revision 1.12 2000/05/21 00:27:31 monnier | ||
| 943 | ;; (comment-styles): New `box-multi'. | ||
| 944 | ;; (comment-normalize-vars): Better default for comment-continue to | ||
| 945 | ;; avoid whitespace-only continuations. | ||
| 946 | ;; (comment-search-forward): Always move even in the no-syntax case. | ||
| 947 | ;; (comment-padright): Only obey N if it's only obeyed for padleft. | ||
| 948 | ;; (comment-make-extra-lines): Better handling of empty continuations. | ||
| 949 | ;; Use `=' for the filler if comment-start has only one character. | ||
| 950 | ;; (uncomment-region): Try handling the special `=' filler. | ||
| 951 | ;; (comment-region): Allow LINES even if MULTI is nil. | ||
| 952 | ;; (comment-box): Choose box style based on comment-style. | ||
| 953 | ;; | ||
| 941 | ;; Revision 1.11 2000/05/19 15:37:41 monnier | 954 | ;; Revision 1.11 2000/05/19 15:37:41 monnier |
| 942 | ;; Fix license text and author. | 955 | ;; Fix license text and author. |
| 943 | ;; Move aliases (indent-for-comment, set-comment-column, kill-comment | 956 | ;; Move aliases (indent-for-comment, set-comment-column, kill-comment |