emacs: lisp/newcomment.el comparison

comparison lisp/newcomment.el @ 39761:1cf8ddfb831f

(comment-indent): Be a little more robust in case comment-indent-function does funny things. (comment-normalize-vars): Autoload. (comment-region-internal): Fiddle with the visibility spec. (comment-valid-prefix): New function. (comment-indent-new-line): Use it. Ignore adaptive-fill-prefixes that would turn comment-text into non-comment-text.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Thu, 11 Oct 2001 01:44:48 +0000
parents	54fe59ee8057
children	71f93e410115

comparison

equal deleted inserted replaced

-:5801481e337c
+:1cf8ddfb831f
 ;; Copyright (C) 1999, 2000  Free Software Foundation Inc.
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: comment uncomment
-;; Revision: $Id: newcomment.el,v 1.34 2001/09/01 21:23:17 monnier Exp $
+;; Revision: $Id: newcomment.el,v 1.35 2001/09/27 21:13:44 monnier Exp $
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 (defun comment-string-reverse (s)
 "Return the mirror image of string S, without any trailing space."
 (comment-string-strip (concat (nreverse (string-to-list s))) nil t))
+;;;###autoload
 (defun comment-normalize-vars (&optional noerror)
 (if (not comment-start) (or noerror (error "No comment syntax is defined"))
 ;; comment-use-syntax
 (when (eq comment-use-syntax 'undecided)
 (set (make-local-variable 'comment-use-syntax)
 ;;(setq comment-end (comment-string-strip comment-end nil t))
 ;; comment-continue
 (unless (or comment-continue (string= comment-end ""))
 (set (make-local-variable 'comment-continue)
 	   (concat (if (string-match "\\S-\\S-" comment-start) " " "|")
-		   (substring comment-start 1))))
+		   (substring comment-start 1)))
+;; Hasn't been necessary yet.
+;; (unless (string-match comment-start-skip comment-continue)
+;; 	(kill-local-variable 'comment-continue))
+)
 ;; comment-skip regexps
 (unless comment-start-skip
 (set (make-local-variable 'comment-start-skip)
 	   (concat "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(\\s<+\\|"
 		   (regexp-quote (comment-string-strip comment-start t t))
 	(setq indent
 	      (min indent
 		   (+ (current-column)
 		      (- fill-column
 			 (save-excursion (end-of-line) (current-column))))))
-	(if (= (current-column) indent)
+	(unless (= (current-column) indent)
-	    (goto-char begpos)
 	  ;; If that's different from current, change it.
-	  (skip-chars-backward " \t")
+	  (delete-region (point) (progn (skip-chars-backward " \t") (point)))
-	  (delete-region (point) begpos)
 	  (indent-to (if (bolp) indent
 		       (max indent (1+ (current-column)))))))
 (goto-char cpos)
 (set-marker cpos nil))))
 ;; If the end is not at the end of a line and the comment-end
 ;; is implicit (i.e. a newline), explicitly insert a newline.
 (unless (or ce (eolp)) (insert "\n") (indent-according-to-mode))
 (comment-with-narrowing beg end
 	(let ((min-indent (point-max))
-	      (max-indent 0))
+	      (max-indent 0)
+	      ;; We rebind the invisibility spec because move-to-column
+	      ;; skips invisible text.  Only reveal ellipses.
+	      (buffer-invisibility-spec
+	       (if (listp buffer-invisibility-spec)
+	      	   (mapcar (lambda (x) (if (cdr-safe x) t x))
+	      		   buffer-invisibility-spec)
+	      	 buffer-invisibility-spec)))
 	  (goto-char (point-min))
 	  ;; Quote any nested comment marker
 	  (comment-quote-nested comment-start comment-end nil)
 	  ;; Loop over all lines to find the needed indentations.
 "Non-nil means to only auto-fill inside comments.
 This has no effect in modes that do not define a comment syntax."
 :type 'boolean
 :group 'comment)
+(defun comment-valid-prefix (prefix compos)
+(or
+;; Accept any prefix if the current comment is not EOL-terminated.
+(save-excursion (goto-char compos) (comment-forward) (not (bolp)))
+;; Accept any prefix that starts with a comment-start marker.
+(string-match (concat "\\`[ \t]*\\(?:" comment-start-skip "\\)")
+		 fill-prefix)))
 ;;;###autoload
 (defun comment-indent-new-line (&optional soft)
 "Break line at point and indent, continuing comment if within one.
 This indents the body of the continued comment
 under the previous comment line.
 			  (setq comin (point))))))
 ;; Now we know we should auto-fill.
 (delete-horizontal-space)
 (if soft (insert-and-inherit ?\n) (newline 1))
-(if fill-prefix
+(if (and fill-prefix (not adaptive-fill-mode))
+	  ;; Blindly trust a non-adaptive fill-prefix.
 	  (progn
 	    (indent-to-left-margin)
 	    (insert-and-inherit fill-prefix))
 	;; If necessary check whether we're inside a comment.
 	  (save-excursion
 	    (backward-char)
 	    (setq compos (comment-beginning))
 	    (setq comin (point))))
-	;; If we're not inside a comment, just try to indent.
+	(cond
-	(if (not compos) (indent-according-to-mode)
+	 ;; If there's an adaptive prefix, use it unless we're inside
+	 ;; a comment and the prefix is not a comment starter.
+	 ((and fill-prefix
+	       (or (not compos)
+		   (comment-valid-prefix fill-prefix compos)))
+	  (indent-to-left-margin)
+	  (insert-and-inherit fill-prefix))
+	 ;; If we're not inside a comment, just try to indent.
+	 ((not compos) (indent-according-to-mode))
+	 (t
 	  (let* ((comment-column
 		  ;; The continuation indentation should be somewhere between
 		  ;; the current line's indentation (plus 2 for good measure)
 		  ;; and the current comment's indentation, with a preference
 		  ;; for comment-column.
 		  ;; The 1+ is to make sure we delete the \n inserted above.
 		  (delete-region pt (1+ (point)))
 		  (beginning-of-line)
 		  (backward-char)
 		  (insert comend)
-		  (forward-char))))))))))
+		  (forward-char)))))))))))
 (provide 'newcomment)
 ;;; newcomment.el ends here

Mercurial > emacs

comparison lisp/newcomment.el @ 39761:1cf8ddfb831f