Mercurial > emacs

changeset 111434:ec9d8615510e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor checkdoc simplifications. * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): Use end-of-line N. (checkdoc-this-string-valid-engine, checkdoc-file-comments-engine): Use line-end-position.
author Glenn Morris <rgm@gnu.org>
date Sat, 06 Nov 2010 18:44:13 -0700
parents 05dc9dca8729
children 810cef5c0eee
files lisp/ChangeLog lisp/emacs-lisp/checkdoc.el
diffstat 2 files changed, 14 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Nov 06 18:36:33 2010 -0700
+++ b/lisp/ChangeLog	Sat Nov 06 18:44:13 2010 -0700
@@ -1,5 +1,10 @@
 2010-11-07  Glenn Morris  <rgm@gnu.org>
 
+	* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+	Use end-of-line N.
+	(checkdoc-this-string-valid-engine, checkdoc-file-comments-engine):
+	Use line-end-position.
+
 	* emacs-lisp/chart.el (chart-zap-chars):
 	* play/decipher.el (decipher-set-map):
 	* progmodes/ada-mode.el (ada-get-current-indent)
--- a/lisp/emacs-lisp/checkdoc.el	Sat Nov 06 18:36:33 2010 -0700
+++ b/lisp/emacs-lisp/checkdoc.el	Sat Nov 06 18:44:13 2010 -0700
@@ -1486,12 +1486,10 @@
 		    "First line not a complete sentence.  Add RET here? "
 		    "\n" t)
 		   (let (l1 l2)
-		     (forward-line 1)
-		     (end-of-line)
+		     (end-of-line 2)
 		     (setq l1 (current-column)
 			   l2 (save-excursion
-				(forward-line 1)
-				(end-of-line)
+				(end-of-line 2)
 				(current-column)))
 		     (if (> (+ l1 l2 1) 80)
 			 (setq msg "Incomplete auto-fix; doc string \
@@ -1508,10 +1506,7 @@
 	       (forward-line 1)
 	       (beginning-of-line)
 	       (if (and (re-search-forward "[.!?:\"]\\([ \t\n]+\\|\"\\)"
-					   (save-excursion
-					     (end-of-line)
-					     (point))
-					   t)
+					   (line-end-position) t)
 			(< (current-column) numc))
 		   (if (checkdoc-autofix-ask-replace
 			p (1+ p)
@@ -1526,9 +1521,7 @@
 	   (if msg
 	       (checkdoc-create-error msg s (save-excursion
 					      (goto-char s)
-					      (end-of-line)
-					      (point)))
-	     nil) ))))
+					      (line-end-position))))))))
      ;; Continuation of above.  Make sure our sentence is capitalized.
      (save-excursion
        (skip-chars-forward "\"\\*")
@@ -1628,7 +1621,7 @@
 	 (if (and (< (point) e) (> (current-column) 80))
 	     (checkdoc-create-error
 	      "Some lines are over 80 columns wide"
-	      s (save-excursion (goto-char s) (end-of-line) (point)) ))))
+	      s (save-excursion (goto-char s) (line-end-position))))))
      ;; Here we deviate to tests based on a variable or function.
      ;; We must do this before checking for symbols in quotes because there
      ;; is a chance that just such a symbol might really be an argument.
@@ -1773,9 +1766,8 @@
 				 (end-of-line)
 				 ;; check string-continuation
 				 (if (checkdoc-char= (preceding-char) ?\\)
-				     (progn (forward-line 1)
-					    (end-of-line)))
-				 (point)))
+				     (line-end-position 2)
+				   (point))))
 			  (rs nil) replace original (case-fold-search t))
 		      (while (and (not rs)
 				  (re-search-forward
@@ -2253,8 +2245,8 @@
 		 (insert ";;; " fn fe " --- " (read-string "Summary: ") "\n"))
 	     (checkdoc-create-error
 	      "The first line should be of the form: \";;; package --- Summary\""
-	      (point-min) (save-excursion (goto-char (point-min)) (end-of-line)
-					  (point))))
+	      (point-min) (save-excursion (goto-char (point-min))
+					  (line-end-position))))
 	 nil))
       (setq
        err