xemacs-beta: lisp/simple.el comparison

comparison lisp/simple.el @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1

author	cvs
date	Mon, 13 Aug 2007 11:03:08 +0200
parents	a4f53d9b3154
children	a300bb07d72d

comparison

equal deleted inserted replaced

-:bd866891f083
+:cc15677e0335
 :type '(choice (const :tag "Use `comment-end'" nil)
 		 string)
 :group 'fill-comments)
 (defun indent-for-comment ()
-"Indent this line's comment to comment column, or insert an empty
+"Indent this line's comment to comment column, or insert an empty comment."
-comment.  Comments starting in column 0 are not moved."
 (interactive "*")
 (let* ((empty (save-excursion (beginning-of-line)
 				(looking-at "[ \t]*$")))
 	 (starter (or (and empty block-comment-start) comment-start))
 	 (ender (or (and empty block-comment-end) comment-end)))
 		     ;; beginning of what was matched.
 		     (skip-syntax-backward " " (match-beginning 0))
 		     (skip-syntax-backward "^ " (match-beginning 0)))))
 	(setq begpos (point))
 	;; Compute desired indent.
-;; XEmacs change: Preserve indentation of comments starting in
+	(if (= (current-column)
-;; column 0, as documented.
+	       (setq indent (funcall comment-indent-function)))
-	(cond
+	    (goto-char begpos)
-	 ((= (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)
 		   (set-marker cpos nil))
 	  ;; No, insert one.
 (lmessage 'command "Comment column set to %d" comment-column))))
 (defun kill-comment (arg)
 "Kill the comment on this line, if any.
 With argument, kill comments on that many lines starting with this one."
-;; this function loses in a lot of situations.  it incorrectly recognizes
+;; this function loses in a lot of situations.  it incorrectly recognises
 ;; comment delimiters sometimes (ergo, inside a string), doesn't work
 ;; with multi-line comments, can kill extra whitespace if comment wasn't
 ;; through end-of-line, et cetera.
 (interactive "*P")
 (or comment-start-skip (error "No comment syntax defined"))
 		  ;; Otherwise, if a comment prefix or fill-prefix is inserted,
 		  ;; point will end up before it rather than after it.
 		  (if (save-excursion
 			(skip-chars-backward " \t")
 			(= (point) fill-point))
-		      ;; 1999-09-17 hniksic: turn off Kinsoku until
-		      ;; it's debugged.
-		      (funcall comment-line-break-function)
 		      ;; 97/3/14 jhod: Kinsoku processing
-;		      ;(indent-new-comment-line)
+		      ;(indent-new-comment-line)
-;		      (let ((spacep (memq (char-before (point)) '(?\  ?\t))))
+		      (let ((spacep (memq (char-before (point)) '(?\  ?\t))))
-;			(funcall comment-line-break-function)
+			(funcall comment-line-break-function)
-;			;; if user type space explicitly, leave SPC
+			;; if user type space explicitly, leave SPC
-;			;; even if there is no WAN.
+			;; even if there is no WAN.
-;			(if spacep
+			(if spacep
-;			    (save-excursion
+			    (save-excursion
-;			      (goto-char fill-point)
+			      (goto-char fill-point)
-;			      ;; put SPC except that there is SPC
+			      ;; put SPC except that there is SPC
-;			      ;; already or there is sentence end.
+			      ;; already or there is sentence end.
-;			      (or (memq (char-after (point)) '(?\  ?\t))
+			      (or (memq (char-after (point)) '(?\  ?\t))
-;				  (fill-end-of-sentence-p)
+				  (fill-end-of-sentence-p)
-;				  (insert ?\ )))))
+				  (insert ?\ )))))
 		    (save-excursion
 		      (goto-char fill-point)
 		      (funcall comment-line-break-function)))
 		  ;; If making the new line didn't reduce the hpos of
 		  ;; the end of the line, then give up now;
 "Automatically break line at a previous space, in insertion of text."
 nil)
 (defun turn-on-auto-fill ()
 "Unconditionally turn on Auto Fill mode."
-(interactive)
 (auto-fill-mode 1))
 (defun set-fill-column (arg)
 "Set `fill-column' to specified argument.
 Just \\[universal-argument] as argument means to use the current column
 		  (setq comstart
 			(buffer-substring (point) (match-end 0)))))))
 (if (and comcol (not fill-prefix))  ; XEmacs - (ENE) from fa-extras.
 	  (let ((comment-column comcol)
 		(comment-start comstart)
-		(block-comment-start comstart)
 		(comment-end comment-end))
 	    (and comment-end (not (equal comment-end ""))
 ;	       (if (not comment-multi-line)
 		     (progn
 		       (forward-char -1)
 (defcustom display-warning-suppressed-classes nil
 "List of classes of warnings that shouldn't be displayed.
 If any of the CLASS symbols associated with a warning is the same as
 any of the symbols listed here, the warning will not be displayed.
-The warning will still be logged in the *Warnings* buffer (unless also
+The warning will still logged in the *Warnings* buffer (unless also
 contained in `log-warning-suppressed-classes'), but the buffer will
 not be automatically popped up.
 See also `log-warning-minimum-level' and `display-warning-minimum-level'."
 :type '(repeat symbol)

Mercurial > hg > xemacs-beta

comparison lisp/simple.el @ 371:cc15677e0335 r21-2b1