Mercurial > emacs
annotate lisp/emacs-lisp/checkdoc.el @ 37754:c65dae846352
*** empty log message ***
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 16 May 2001 12:18:53 +0000 |
parents | 71d360920aad |
children | b174db545cfd |
rev | line source |
---|---|
20085 | 1 ;;; checkdoc --- Check documentation strings for style requirements |
2 | |
37162
0b99eb07fc17
(checkdoc-common-verbs-wrong-voice): Add
Gerd Moellmann <gerd@gnu.org>
parents:
33495
diff
changeset
|
3 ;;; Copyright (C) 1997, 1998, 2001 Free Software Foundation |
21181 | 4 |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
5 ;; Author: Eric M. Ludlam <zappo@gnu.org> |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
6 ;; Version: 0.6.2 |
20085 | 7 ;; Keywords: docs, maint, lisp |
21181 | 8 |
20085 | 9 ;; This file is part of GNU Emacs. |
21181 | 10 |
20085 | 11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
21181 | 15 |
20085 | 16 ;; GNU Emacs is distributed in the hope that it will be useful, |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
21181 | 20 |
20085 | 21 ;; You should have received a copy of the GNU General Public License |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
25 | |
26 ;;; Commentary: | |
27 ;; | |
22195 | 28 ;; The Emacs Lisp manual has a nice chapter on how to write |
20085 | 29 ;; documentation strings. Many stylistic suggestions are fairly |
30 ;; deterministic and easy to check for syntactically, but also easy | |
31 ;; to forget. The main checkdoc engine will perform the stylistic | |
32 ;; checks needed to make sure these styles are remembered. | |
33 ;; | |
34 ;; There are two ways to use checkdoc: | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
35 ;; 1) Periodically use `checkdoc' or `checkdoc-current-buffer'. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
36 ;; `checkdoc' is a more interactive version of |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
37 ;; `checkdoc-current-buffer' |
20085 | 38 ;; 2) Use `checkdoc-minor-mode' to automatically check your |
22195 | 39 ;; documentation whenever you evaluate Lisp code with C-M-x |
20085 | 40 ;; or [menu-bar emacs-lisp eval-buffer]. Additional key-bindings |
41 ;; are also provided under C-c ? KEY | |
42 ;; (require 'checkdoc) | |
43 ;; (add-hook 'emacs-lisp-mode-hook | |
44 ;; '(lambda () (checkdoc-minor-mode 1))) | |
45 ;; | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
46 ;; Using `checkdoc': |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
47 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
48 ;; The commands `checkdoc' and `checkdoc-ispell' are the top-level |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
49 ;; entry points to all of the different checks that are available. It |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
50 ;; breaks examination of your Lisp file into four sections (comments, |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
51 ;; documentation, messages, and spacing) and indicates its current |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
52 ;; state in a status buffer. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
53 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
54 ;; The Comments check examines your headers, footers, and |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
55 ;; various tags (such as "Code:") to make sure that your code is ready |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
56 ;; for easy integration into existing systems. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
57 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
58 ;; The Documentation check deals with documentation strings |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
59 ;; and their elements that help make Emacs easier to use. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
60 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
61 ;; The Messages check ensures that the strings displayed in the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
62 ;; minibuffer by some commands (such as `error' and `y-or-n-p') |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
63 ;; are consistent with the Emacs environment. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
64 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
65 ;; The Spacing check cleans up white-space at the end of lines. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
66 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
67 ;; The interface while working with documentation and messages is |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
68 ;; slightly different when being run in the interactive mode. The |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
69 ;; interface offers several options, including the ability to skip to |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
70 ;; the next error, or back up to previous errors. Auto-fixing is |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
71 ;; turned off at this stage, but you can use the `f' or `F' key to fix |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
72 ;; a given error (if the fix is available.) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
73 ;; |
20085 | 74 ;; Auto-fixing: |
75 ;; | |
76 ;; There are four classifications of style errors in terms of how | |
77 ;; easy they are to fix. They are simple, complex, really complex, | |
78 ;; and impossible. (Impossible really means that checkdoc does not | |
79 ;; have a fixing routine yet.) Typically white-space errors are | |
80 ;; classified as simple, and are auto-fixed by default. Typographic | |
81 ;; changes are considered complex, and the user is asked if they want | |
82 ;; the problem fixed before checkdoc makes the change. These changes | |
83 ;; can be done without asking if `checkdoc-autofix-flag' is properly | |
84 ;; set. Potentially redundant changes are considered really complex, | |
85 ;; and the user is always asked before a change is inserted. The | |
86 ;; variable `checkdoc-autofix-flag' controls how these types of errors | |
87 ;; are fixed. | |
88 ;; | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
89 ;; Spell checking text: |
20085 | 90 ;; |
91 ;; The variable `checkdoc-spellcheck-documentation-flag' can be set | |
92 ;; to customize how spell checking is to be done. Since spell | |
93 ;; checking can be quite slow, you can optimize how best you want your | |
94 ;; checking done. The default is 'defun, which spell checks each time | |
95 ;; `checkdoc-defun' or `checkdoc-eval-defun' is used. Setting to nil | |
96 ;; prevents spell checking during normal usage. | |
97 ;; Setting this variable to nil does not mean you cannot take | |
98 ;; advantage of the spell checking. You can instead use the | |
99 ;; interactive functions `checkdoc-ispell-*' to check the spelling of | |
100 ;; your documentation. | |
22195 | 101 ;; There is a list of Lisp-specific words which checkdoc will |
102 ;; install into Ispell on the fly, but only if Ispell is not already | |
20085 | 103 ;; running. Use `ispell-kill-ispell' to make checkdoc restart it with |
104 ;; these words enabled. | |
105 ;; | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
106 ;; Checking parameters: |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
107 ;; |
22514
dee11277c07d
(checkdoc-eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
22195
diff
changeset
|
108 ;; You might not always want a function to have its parameters listed |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
109 ;; in order. When this is the case, put the following comment just in |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
110 ;; front of the documentation string: "; checkdoc-order: nil" This |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
111 ;; overrides the value of `checkdoc-arguments-in-order-flag'. |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
112 ;; |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
113 ;; If you specifically wish to avoid mentioning a parameter of a |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
114 ;; function in the doc string (such as a hidden parameter, or a |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
115 ;; parameter which is very obvious like events), you can have checkdoc |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
116 ;; skip looking for it by putting the following comment just in front |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
117 ;; of the documentation string: "; checkdoc-params: (args go here)" |
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
118 ;; |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
119 ;; Checking message strings: |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
120 ;; |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
121 ;; The text that follows the `error' and `y-or-n-p' commands is |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
122 ;; also checked. The documentation for `error' clearly states some |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
123 ;; simple style rules to follow which checkdoc will auto-fix for you. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
124 ;; `y-or-n-p' also states that it should end in a space. I added that |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
125 ;; it should end in "? " since that is almost always used. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
126 ;; |
20085 | 127 ;; Adding your own checks: |
128 ;; | |
129 ;; You can experiment with adding your own checks by setting the | |
130 ;; hooks `checkdoc-style-hooks' and `checkdoc-comment-style-hooks'. | |
131 ;; Return a string which is the error you wish to report. The cursor | |
132 ;; position should be preserved. | |
133 ;; | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
134 ;; Error errors: |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
135 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
136 ;; Checkdoc does not always flag errors correctly. There are a |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
137 ;; couple ways you can coax your file into passing all of checkdoc's |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
138 ;; tests through buffer local variables. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
139 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
140 ;; The variable `checkdoc-verb-check-experimental-flag' can be used |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
141 ;; to turn off the check for verb-voice in case you use words that are |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
142 ;; not semantically verbs, but are still in the incomplete list. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
143 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
144 ;; The variable `checkdoc-symbol-words' can be a list of words that |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
145 ;; happen to also be symbols. This is not a problem for one-word |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
146 ;; symbols, but if you use a hyphenated word that is also a symbol, |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
147 ;; then you may need this. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
148 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
149 ;; The symbol `checkdoc-force-docstrings-flag' can be set to nil if |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
150 ;; you have many undocumented functions you don't wish to document. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
151 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
152 ;; See the above section "Checking Parameters" for details about |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
153 ;; parameter checking. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
154 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
155 ;; Dependencies: |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
156 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
157 ;; This file requires lisp-mnt (Lisp maintenance routines) for the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
158 ;; comment checkers. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
159 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
160 ;; Requires custom for Emacs v20. |
20085 | 161 |
162 ;;; TO DO: | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
163 ;; Hook into the byte compiler on a defun/defvar level to generate |
20085 | 164 ;; warnings in the byte-compiler's warning/error buffer. |
165 ;; Better ways to override more typical `eval' functions. Advice | |
166 ;; might be good but hard to turn on/off as a minor mode. | |
167 ;; | |
168 ;;; Maybe Do: | |
169 ;; Code sweep checks for "forbidden functions", proper use of hooks, | |
170 ;; proper keybindings, and other items from the manual that are | |
171 ;; not specifically docstring related. Would this even be useful? | |
172 | |
173 ;;; Code: | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
174 (defvar checkdoc-version "0.6.1" |
20085 | 175 "Release version of checkdoc you are currently running.") |
176 | |
177 ;; From custom web page for compatibility between versions of custom: | |
178 (eval-and-compile | |
179 (condition-case () | |
180 (require 'custom) | |
181 (error nil)) | |
182 (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) | |
183 nil ;; We've got what we needed | |
184 ;; We have the old custom-library, hack around it! | |
185 (defmacro defgroup (&rest args) | |
186 nil) | |
187 (defmacro custom-add-option (&rest args) | |
188 nil) | |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
189 (defmacro defcustom (var value doc &rest args) |
20085 | 190 (` (defvar (, var) (, value) (, doc)))))) |
191 | |
192 (defcustom checkdoc-autofix-flag 'semiautomatic | |
22195 | 193 "*Non-nil means attempt auto-fixing of doc strings. |
194 If this value is the symbol `query', then the user is queried before | |
195 any change is made. If the value is `automatic', then all changes are | |
20085 | 196 made without asking unless the change is very-complex. If the value |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
197 is `semiautomatic' or any other value, then simple fixes are made |
20085 | 198 without asking, and complex changes are made by asking the user first. |
22195 | 199 The value `never' is the same as nil, never ask or change anything." |
20085 | 200 :group 'checkdoc |
201 :type '(choice (const automatic) | |
202 (const query) | |
22579
d0ad271c7774
(checkdoc-autofix-flag): Use `other'
Andreas Schwab <schwab@suse.de>
parents:
22514
diff
changeset
|
203 (const never) |
d0ad271c7774
(checkdoc-autofix-flag): Use `other'
Andreas Schwab <schwab@suse.de>
parents:
22514
diff
changeset
|
204 (other :tag "semiautomatic" semiautomatic))) |
20085 | 205 |
206 (defcustom checkdoc-bouncy-flag t | |
22195 | 207 "*Non-nil means to \"bounce\" to auto-fix locations. |
20085 | 208 Setting this to nil will silently make fixes that require no user |
209 interaction. See `checkdoc-autofix-flag' for auto-fixing details." | |
210 :group 'checkdoc | |
211 :type 'boolean) | |
212 | |
213 (defcustom checkdoc-force-docstrings-flag t | |
214 "*Non-nil means that all checkable definitions should have documentation. | |
215 Style guide dictates that interactive functions MUST have documentation, | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
216 and that it's good but not required practice to make non user visible items |
22195 | 217 have doc strings." |
20085 | 218 :group 'checkdoc |
219 :type 'boolean) | |
220 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
221 (defcustom checkdoc-force-history-flag t |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
222 "*Non-nil means that files should have a History section or ChangeLog file. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
223 This helps document the evolution of, and recent changes to, the package." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
224 :group 'checkdoc |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
225 :type 'boolean) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
226 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
227 (defcustom checkdoc-permit-comma-termination-flag nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
228 "*Non-nil means the first line of a docstring may end with a comma. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
229 Ordinarily, a full sentence is required. This may be misleading when |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
230 there is a substantial caveat to the one-line description -- the comma |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
231 should be used when the first part could stand alone as a sentence, but |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
232 it indicates that a modifying clause follows." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
233 :group 'checkdoc |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
234 :type 'boolean) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
235 |
20085 | 236 (defcustom checkdoc-spellcheck-documentation-flag nil |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
237 "*Non-nil means run Ispell on text based on value. |
22195 | 238 This is automatically set to nil if Ispell does not exist on your |
20085 | 239 system. Possible values are: |
240 | |
22195 | 241 nil - Don't spell-check during basic style checks. |
242 defun - Spell-check when style checking a single defun | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
243 buffer - Spell-check when style checking the whole buffer |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
244 interactive - Spell-check during any interactive check. |
22195 | 245 t - Always spell-check" |
20085 | 246 :group 'checkdoc |
247 :type '(choice (const nil) | |
248 (const defun) | |
249 (const buffer) | |
250 (const interactive) | |
251 (const t))) | |
252 | |
253 (defvar checkdoc-ispell-lisp-words | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
254 '("alist" "emacs" "etags" "iff" "keymap" "paren" "regexp" "sexp" "xemacs") |
22195 | 255 "List of words that are correct when spell-checking Lisp documentation.") |
20085 | 256 |
257 (defcustom checkdoc-max-keyref-before-warn 10 | |
22195 | 258 "*The number of \\ [command-to-keystroke] tokens allowed in a doc string. |
20085 | 259 Any more than this and a warning is generated suggesting that the construct |
260 \\ {keymap} be used instead." | |
261 :group 'checkdoc | |
262 :type 'integer) | |
263 | |
264 (defcustom checkdoc-arguments-in-order-flag t | |
265 "*Non-nil means warn if arguments appear out of order. | |
266 Setting this to nil will mean only checking that all the arguments | |
267 appear in the proper form in the documentation, not that they are in | |
268 the same order as they appear in the argument list. No mention is | |
269 made in the style guide relating to order." | |
270 :group 'checkdoc | |
271 :type 'boolean) | |
272 | |
273 (defvar checkdoc-style-hooks nil | |
274 "Hooks called after the standard style check is completed. | |
275 All hooks must return nil or a string representing the error found. | |
276 Useful for adding new user implemented commands. | |
277 | |
278 Each hook is called with two parameters, (DEFUNINFO ENDPOINT). | |
279 DEFUNINFO is the return value of `checkdoc-defun-info'. ENDPOINT is the | |
280 location of end of the documentation string.") | |
281 | |
282 (defvar checkdoc-comment-style-hooks nil | |
283 "Hooks called after the standard comment style check is completed. | |
284 Must return nil if no errors are found, or a string describing the | |
285 problem discovered. This is useful for adding additional checks.") | |
286 | |
287 (defvar checkdoc-diagnostic-buffer "*Style Warnings*" | |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
288 "Name of warning message buffer.") |
20085 | 289 |
290 (defvar checkdoc-defun-regexp | |
291 "^(def\\(un\\|var\\|custom\\|macro\\|const\\|subst\\|advice\\)\ | |
292 \\s-+\\(\\(\\sw\\|\\s_\\)+\\)[ \t\n]+" | |
293 "Regular expression used to identify a defun. | |
294 A search leaves the cursor in front of the parameter list.") | |
295 | |
296 (defcustom checkdoc-verb-check-experimental-flag t | |
22195 | 297 "*Non-nil means to attempt to check the voice of the doc string. |
20085 | 298 This check keys off some words which are commonly misused. See the |
22195 | 299 variable `checkdoc-common-verbs-wrong-voice' if you wish to add your own." |
20085 | 300 :group 'checkdoc |
301 :type 'boolean) | |
302 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
303 (defvar checkdoc-generate-compile-warnings-flag nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
304 "Non-nil means generage warnings in a buffer for browsing. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
305 Do not set this by hand, use a function like `checkdoc-current-buffer' |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
306 with a universal argument.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
307 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
308 (defcustom checkdoc-symbol-words nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
309 "A list of symbols which also happen to make good words. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
310 These symbol-words are ignored when unquoted symbols are searched for. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
311 This should be set in an Emacs Lisp file's local variables." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
312 :group 'checkdoc |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
313 :type '(repeat (symbol :tag "Word"))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
314 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
315 (defvar checkdoc-proper-noun-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
316 '("ispell" "xemacs" "emacs" "lisp") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
317 "List of words (not capitalized) which should be capitalized.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
318 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
319 (defvar checkdoc-proper-noun-regexp |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
320 (let ((expr "\\<\\(") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
321 (l checkdoc-proper-noun-list)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
322 (while l |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
323 (setq expr (concat expr (car l) (if (cdr l) "\\|" "")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
324 l (cdr l))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
325 (concat expr "\\)\\>")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
326 "Regular expression derived from `checkdoc-proper-noun-regexp'.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
327 |
20085 | 328 (defvar checkdoc-common-verbs-regexp nil |
329 "Regular expression derived from `checkdoc-common-verbs-regexp'.") | |
330 | |
331 (defvar checkdoc-common-verbs-wrong-voice | |
332 '(("adds" . "add") | |
333 ("allows" . "allow") | |
334 ("appends" . "append") | |
22514
dee11277c07d
(checkdoc-eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
22195
diff
changeset
|
335 ("applies" . "apply") |
dee11277c07d
(checkdoc-eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
22195
diff
changeset
|
336 ("arranges" . "arrange") |
20085 | 337 ("brings" . "bring") |
338 ("calls" . "call") | |
339 ("catches" . "catch") | |
340 ("changes" . "change") | |
341 ("checks" . "check") | |
342 ("contains" . "contain") | |
37162
0b99eb07fc17
(checkdoc-common-verbs-wrong-voice): Add
Gerd Moellmann <gerd@gnu.org>
parents:
33495
diff
changeset
|
343 ("converts" . "convert") |
20085 | 344 ("creates" . "create") |
345 ("destroys" . "destroy") | |
346 ("disables" . "disable") | |
347 ("executes" . "execute") | |
22514
dee11277c07d
(checkdoc-eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
22195
diff
changeset
|
348 ("evals" . "evaluate") |
20085 | 349 ("evaluates" . "evaluate") |
350 ("finds" . "find") | |
351 ("forces" . "force") | |
352 ("gathers" . "gather") | |
353 ("generates" . "generate") | |
354 ("goes" . "go") | |
355 ("guesses" . "guess") | |
356 ("highlights" . "highlight") | |
357 ("holds" . "hold") | |
358 ("ignores" . "ignore") | |
359 ("indents" . "indent") | |
360 ("initializes" . "initialize") | |
361 ("inserts" . "insert") | |
362 ("installs" . "install") | |
363 ("investigates" . "investigate") | |
364 ("keeps" . "keep") | |
365 ("kills" . "kill") | |
366 ("leaves" . "leave") | |
367 ("lets" . "let") | |
368 ("loads" . "load") | |
369 ("looks" . "look") | |
370 ("makes" . "make") | |
371 ("marks" . "mark") | |
372 ("matches" . "match") | |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
373 ("moves" . "move") |
20085 | 374 ("notifies" . "notify") |
375 ("offers" . "offer") | |
376 ("parses" . "parse") | |
377 ("performs" . "perform") | |
378 ("prepares" . "prepare") | |
379 ("prepends" . "prepend") | |
380 ("reads" . "read") | |
381 ("raises" . "raise") | |
382 ("removes" . "remove") | |
383 ("replaces" . "replace") | |
384 ("resets" . "reset") | |
385 ("restores" . "restore") | |
386 ("returns" . "return") | |
387 ("runs" . "run") | |
388 ("saves" . "save") | |
389 ("says" . "say") | |
390 ("searches" . "search") | |
391 ("selects" . "select") | |
392 ("sets" . "set") | |
393 ("sex" . "s*x") | |
394 ("shows" . "show") | |
395 ("signifies" . "signify") | |
396 ("sorts" . "sort") | |
397 ("starts" . "start") | |
398 ("stores" . "store") | |
399 ("switches" . "switch") | |
400 ("tells" . "tell") | |
401 ("tests" . "test") | |
402 ("toggles" . "toggle") | |
22514
dee11277c07d
(checkdoc-eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
22195
diff
changeset
|
403 ("tries" . "try") |
20085 | 404 ("turns" . "turn") |
405 ("undoes" . "undo") | |
406 ("unloads" . "unload") | |
407 ("unmarks" . "unmark") | |
408 ("updates" . "update") | |
409 ("uses" . "use") | |
410 ("yanks" . "yank") | |
411 ) | |
412 "Alist of common words in the wrong voice and what should be used instead. | |
413 Set `checkdoc-verb-check-experimental-flag' to nil to avoid this costly | |
414 and experimental check. Do not modify this list without setting | |
415 the value of `checkdoc-common-verbs-regexp' to nil which cause it to | |
416 be re-created.") | |
417 | |
418 (defvar checkdoc-syntax-table nil | |
419 "Syntax table used by checkdoc in document strings.") | |
420 | |
421 (if checkdoc-syntax-table | |
422 nil | |
423 (setq checkdoc-syntax-table (copy-syntax-table emacs-lisp-mode-syntax-table)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
424 ;; When dealing with syntax in doc strings, make sure that - are encompassed |
20085 | 425 ;; in words so we can use cheap \\> to get the end of a symbol, not the |
426 ;; end of a word in a conglomerate. | |
427 (modify-syntax-entry ?- "w" checkdoc-syntax-table) | |
428 ) | |
429 | |
430 | |
431 ;;; Compatibility | |
432 ;; | |
433 (if (string-match "X[Ee]macs" emacs-version) | |
434 (progn | |
435 (defalias 'checkdoc-make-overlay 'make-extent) | |
436 (defalias 'checkdoc-overlay-put 'set-extent-property) | |
437 (defalias 'checkdoc-delete-overlay 'delete-extent) | |
438 (defalias 'checkdoc-overlay-start 'extent-start) | |
439 (defalias 'checkdoc-overlay-end 'extent-end) | |
440 (defalias 'checkdoc-mode-line-update 'redraw-modeline) | |
441 (defalias 'checkdoc-call-eval-buffer 'eval-buffer) | |
442 ) | |
443 (defalias 'checkdoc-make-overlay 'make-overlay) | |
444 (defalias 'checkdoc-overlay-put 'overlay-put) | |
445 (defalias 'checkdoc-delete-overlay 'delete-overlay) | |
446 (defalias 'checkdoc-overlay-start 'overlay-start) | |
447 (defalias 'checkdoc-overlay-end 'overlay-end) | |
448 (defalias 'checkdoc-mode-line-update 'force-mode-line-update) | |
449 (defalias 'checkdoc-call-eval-buffer 'eval-current-buffer) | |
450 ) | |
451 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
452 ;; Emacs 20 has this handy function. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
453 (if (not (fboundp 'princ-list)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
454 (defun princ-list (&rest args) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
455 "Call `princ' on ARGS." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
456 (mapcar 'princ args))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
457 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
458 ;; Emacs 20s have MULE characters which don't equate to numbers. |
20085 | 459 (if (fboundp 'char=) |
460 (defalias 'checkdoc-char= 'char=) | |
461 (defalias 'checkdoc-char= '=)) | |
462 | |
463 ;; Emacs 19.28 and earlier don't have the handy 'add-to-list function | |
464 (if (fboundp 'add-to-list) | |
465 | |
466 (defalias 'checkdoc-add-to-list 'add-to-list) | |
467 | |
468 (defun checkdoc-add-to-list (list-var element) | |
469 "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet." | |
470 (if (not (member element (symbol-value list-var))) | |
471 (set list-var (cons element (symbol-value list-var))))) | |
472 ) | |
473 | |
22195 | 474 ;; To be safe in new Emacsen, we want to read events, not characters |
20085 | 475 (if (fboundp 'read-event) |
476 (defalias 'checkdoc-read-event 'read-event) | |
477 (defalias 'checkdoc-read-event 'read-char)) | |
478 | |
479 ;;; User level commands | |
480 ;; | |
481 ;;;###autoload | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
482 (defun checkdoc () |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
483 "Interactivly check the entire buffer for style errors. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
484 The current status of the ckeck will be displayed in a buffer which |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
485 the users will view as each check is completed." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
486 (interactive) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
487 (let ((status (list "Checking..." "-" "-" "-")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
488 (checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
489 (member checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
490 '(buffer interactive t))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
491 ;; if the user set autofix to never, then that breaks the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
492 ;; obviously requested asking implied by using this function. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
493 ;; Set it to paranoia level. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
494 (checkdoc-autofix-flag (if (or (not checkdoc-autofix-flag) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
495 (eq checkdoc-autofix-flag 'never)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
496 'query |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
497 checkdoc-autofix-flag)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
498 tmp) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
499 (checkdoc-display-status-buffer status) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
500 ;; check the comments |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
501 (if (not buffer-file-name) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
502 (setcar status "Not checked") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
503 (if (checkdoc-file-comments-engine) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
504 (setcar status "Errors") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
505 (setcar status "Ok"))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
506 (setcar (cdr status) "Checking...") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
507 (checkdoc-display-status-buffer status) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
508 ;; Check the documentation |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
509 (setq tmp (checkdoc-interactive nil t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
510 (if tmp |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
511 (setcar (cdr status) (format "%d Errors" (length tmp))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
512 (setcar (cdr status) "Ok")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
513 (setcar (cdr (cdr status)) "Checking...") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
514 (checkdoc-display-status-buffer status) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
515 ;; Check the message text |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
516 (if (setq tmp (checkdoc-message-interactive nil t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
517 (setcar (cdr (cdr status)) (format "%d Errors" (length tmp))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
518 (setcar (cdr (cdr status)) "Ok")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
519 (setcar (cdr (cdr (cdr status))) "Checking...") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
520 (checkdoc-display-status-buffer status) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
521 ;; Rogue spacing |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
522 (if (condition-case nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
523 (checkdoc-rogue-spaces nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
524 (error t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
525 (setcar (cdr (cdr (cdr status))) "Errors") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
526 (setcar (cdr (cdr (cdr status))) "Ok")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
527 (checkdoc-display-status-buffer status))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
528 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
529 (defun checkdoc-display-status-buffer (check) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
530 "Display and update the status buffer for the current checkdoc mode. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
531 CHECK is a vector stating the current status of each test as an |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
532 element is the status of that level of teset." |
25697
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
533 (let (temp-buffer-setup-hook) |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
534 (with-output-to-temp-buffer " *Checkdoc Status*" |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
535 (princ-list |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
536 "Buffer comments and tags: " (nth 0 check) "\n" |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
537 "Documentation style: " (nth 1 check) "\n" |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
538 "Message/Query text style: " (nth 2 check) "\n" |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
539 "Unwanted Spaces: " (nth 3 check) |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
540 ))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
541 (shrink-window-if-larger-than-buffer |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
542 (get-buffer-window " *Checkdoc Status*")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
543 (message nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
544 (sit-for 0)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
545 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
546 ;;;###autoload |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
547 (defun checkdoc-interactive (&optional start-here showstatus) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
548 "Interactively check the current buffer for doc string errors. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
549 Prefix argument START-HERE will start the checking from the current |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
550 point, otherwise the check starts at the beginning of the current |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
551 buffer. Allows navigation forward and backwards through document |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
552 errors. Does not check for comment or space warnings. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
553 Optional argument SHOWSTATUS indicates that we should update the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
554 checkdoc status window instead of the usual behavior." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
555 (interactive "P") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
556 (let ((checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
557 (member checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
558 '(interactive t)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
559 (checkdoc-interactive-loop start-here showstatus 'checkdoc-next-error))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
560 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
561 ;;;###autoload |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
562 (defun checkdoc-message-interactive (&optional start-here showstatus) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
563 "Interactively check the current buffer for message string errors. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
564 Prefix argument START-HERE will start the checking from the current |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
565 point, otherwise the check starts at the beginning of the current |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
566 buffer. Allows navigation forward and backwards through document |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
567 errors. Does not check for comment or space warnings. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
568 Optional argument SHOWSTATUS indicates that we should update the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
569 checkdoc status window instead of the usual behavior." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
570 (interactive "P") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
571 (let ((checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
572 (member checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
573 '(interactive t)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
574 (checkdoc-interactive-loop start-here showstatus |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
575 'checkdoc-next-message-error))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
576 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
577 (defun checkdoc-interactive-loop (start-here showstatus findfunc) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
578 "Interactivly loop over all errors that can be found by a given method. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
579 Searching starts at START-HERE. SHOWSTATUS expresses the verbosity |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
580 of the search, and wether ending the search will auto-exit this function. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
581 FINDFUNC is a symbol representing a function that will position the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
582 cursor, and return error message text to present the the user. It is |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
583 assumed that the cursor will stop just before a major sexp, which will |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
584 be highlighted to present the user with feedback as to the offending |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
585 style." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
586 ;; Determine where to start the test |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
587 (let* ((begin (prog1 (point) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
588 (if (not start-here) (goto-char (point-min))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
589 ;; Assign a flag to spellcheck flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
590 (checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
591 (member checkdoc-spellcheck-documentation-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
592 '(buffer interactive t))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
593 ;; Fetch the error list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
594 (err-list (list (funcall findfunc nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
595 (cdo nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
596 (returnme nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
597 c) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
598 (save-window-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
599 (if (not (car err-list)) (setq err-list nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
600 ;; Include whatever function point is in for good measure. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
601 (beginning-of-defun) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
602 (while err-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
603 (goto-char (cdr (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
604 ;; The cursor should be just in front of the offending doc string |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
605 (if (stringp (car (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
606 (setq cdo (save-excursion (checkdoc-make-overlay |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
607 (point) (progn (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
608 (point))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
609 (setq cdo (checkdoc-make-overlay |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
610 (checkdoc-error-start (car (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
611 (checkdoc-error-end (car (car err-list)))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
612 (unwind-protect |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
613 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
614 (checkdoc-overlay-put cdo 'face 'highlight) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
615 ;; Make sure the whole doc string is visible if possible. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
616 (sit-for 0) |
27444
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
617 (if (and (looking-at "\"") |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
618 (not (pos-visible-in-window-p |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
619 (save-excursion (forward-sexp 1) (point)) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
620 (selected-window)))) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
621 (let ((l (count-lines (point) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
622 (save-excursion |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
623 (forward-sexp 1) (point))))) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
624 (if (> l (window-height)) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
625 (recenter 1) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
626 (recenter (/ (- (window-height) l) 2)))) |
89c53b25be12
(checkdoc-interactive-loop): Don't lose on a function with an empty
Dave Love <fx@gnu.org>
parents:
26615
diff
changeset
|
627 (recenter)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
628 (message "%s (C-h,%se,n,p,q)" (checkdoc-error-text |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
629 (car (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
630 (if (checkdoc-error-unfixable (car (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
631 "" "f,")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
632 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
633 (goto-char (checkdoc-error-start (car (car err-list)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
634 (if (not (pos-visible-in-window-p)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
635 (recenter (- (window-height) 2))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
636 (setq c (checkdoc-read-event)))1 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
637 (if (not (integerp c)) (setq c ??)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
638 (cond |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
639 ;; Exit condition |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
640 ((checkdoc-char= c ?\C-g) (signal 'quit nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
641 ;; Request an auto-fix |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
642 ((or (checkdoc-char= c ?y) (checkdoc-char= c ?f)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
643 (checkdoc-delete-overlay cdo) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
644 (setq cdo nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
645 (goto-char (cdr (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
646 ;; `automatic-then-never' tells the autofix function |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
647 ;; to only allow one fix to be automatic. The autofix |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
648 ;; function will than set the flag to 'never, allowing |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
649 ;; the checker to return a different error. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
650 (let ((checkdoc-autofix-flag 'automatic-then-never) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
651 (fixed nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
652 (funcall findfunc t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
653 (setq fixed (not (eq checkdoc-autofix-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
654 'automatic-then-never))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
655 (if (not fixed) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
656 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
657 (message "A Fix was not available.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
658 (sit-for 2)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
659 (setq err-list (cdr err-list)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
660 (beginning-of-defun) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
661 (let ((pe (car err-list)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
662 (ne (funcall findfunc nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
663 (if ne |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
664 (setq err-list (cons ne err-list)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
665 (cond ((not err-list) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
666 (message "No More Stylistic Errors.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
667 (sit-for 2)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
668 (t |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
669 (message |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
670 "No Additional style errors. Continuing...") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
671 (sit-for 2)))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
672 ;; Move to the next error (if available) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
673 ((or (checkdoc-char= c ?n) (checkdoc-char= c ?\ )) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
674 (let ((ne (funcall findfunc nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
675 (if (not ne) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
676 (if showstatus |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
677 (setq returnme err-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
678 err-list nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
679 (if (not err-list) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
680 (message "No More Stylistic Errors.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
681 (message "No Additional style errors. Continuing...")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
682 (sit-for 2)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
683 (setq err-list (cons ne err-list))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
684 ;; Go backwards in the list of errors |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
685 ((or (checkdoc-char= c ?p) (checkdoc-char= c ?\C-?)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
686 (if (/= (length err-list) 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
687 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
688 (setq err-list (cdr err-list)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
689 (goto-char (cdr (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
690 (beginning-of-defun)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
691 (message "No Previous Errors.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
692 (sit-for 2))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
693 ;; Edit the buffer recursively. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
694 ((checkdoc-char= c ?e) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
695 (checkdoc-recursive-edit |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
696 (checkdoc-error-text (car (car err-list)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
697 (checkdoc-delete-overlay cdo) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
698 (setq err-list (cdr err-list)) ;back up the error found. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
699 (beginning-of-defun) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
700 (let ((ne (funcall findfunc nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
701 (if (not ne) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
702 (if showstatus |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
703 (setq returnme err-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
704 err-list nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
705 (message "No More Stylistic Errors.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
706 (sit-for 2)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
707 (setq err-list (cons ne err-list))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
708 ;; Quit checkdoc |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
709 ((checkdoc-char= c ?q) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
710 (setq returnme err-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
711 err-list nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
712 begin (point))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
713 ;; Goofy s tuff |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
714 (t |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
715 (if (get-buffer-window "*Checkdoc Help*") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
716 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
717 (delete-window (get-buffer-window "*Checkdoc Help*")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
718 (kill-buffer "*Checkdoc Help*")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
719 (with-output-to-temp-buffer "*Checkdoc Help*" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
720 (princ-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
721 "Checkdoc Keyboard Summary:\n" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
722 (if (checkdoc-error-unfixable (car (car err-list))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
723 "" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
724 (concat |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
725 "f, y - auto Fix this warning without asking (if\ |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
726 available.)\n" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
727 " Very complex operations will still query.\n") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
728 ) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
729 "e - Enter recursive Edit. Press C-M-c to exit.\n" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
730 "SPC, n - skip to the Next error.\n" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
731 "DEL, p - skip to the Previous error.\n" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
732 "q - Quit checkdoc.\n" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
733 "C-h - Toggle this help buffer.")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
734 (shrink-window-if-larger-than-buffer |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
735 (get-buffer-window "*Checkdoc Help*")))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
736 (if cdo (checkdoc-delete-overlay cdo))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
737 (goto-char begin) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
738 (if (get-buffer "*Checkdoc Help*") (kill-buffer "*Checkdoc Help*")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
739 (message "Checkdoc: Done.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
740 returnme)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
741 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
742 (defun checkdoc-next-error (enable-fix) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
743 "Find and return the next checkdoc error list, or nil. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
744 Only documentation strings are checked. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
745 Add error vector is of the form (WARNING . POSITION) where WARNING |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
746 is the warning text, and POSITION is the point in the buffer where the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
747 error was found. We can use points and not markers because we promise |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
748 not to edit the buffer before point without re-executing this check. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
749 Argument ENABLE-FIX will enable auto-fixing while looking for the next |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
750 error. This argument assumes that the cursor is already positioned to |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
751 perform the fix." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
752 (if enable-fix |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
753 (checkdoc-this-string-valid) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
754 (let ((msg nil) (p (point)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
755 (checkdoc-autofix-flag nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
756 (condition-case nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
757 (while (and (not msg) (checkdoc-next-docstring)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
758 (message "Searching for doc string error...%d%%" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
759 (/ (* 100 (point)) (point-max))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
760 (if (setq msg (checkdoc-this-string-valid)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
761 (setq msg (cons msg (point))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
762 ;; Quit.. restore position, Other errors, leave alone |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
763 (quit (goto-char p))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
764 msg))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
765 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
766 (defun checkdoc-next-message-error (enable-fix) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
767 "Find and return the next checkdoc mesasge related error list, or nil. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
768 Only text for error and `y-or-n-p' strings are checked. See |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
769 `checkdoc-next-error' for details on the return value. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
770 Argument ENABLE-FIX turns on the auto-fix feature. This argument |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
771 assumes that the cursor is already positioned to perform the fix." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
772 (if enable-fix |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
773 (checkdoc-message-text-engine) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
774 (let ((msg nil) (p (point)) (type nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
775 (checkdoc-autofix-flag nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
776 (condition-case nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
777 (while (and (not msg) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
778 (setq type |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
779 (checkdoc-message-text-next-string (point-max)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
780 (message "Searching for message string error...%d%%" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
781 (/ (* 100 (point)) (point-max))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
782 (if (setq msg (checkdoc-message-text-engine type)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
783 (setq msg (cons msg (point))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
784 ;; Quit.. restore position, Other errors, leave alone |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
785 (quit (goto-char p))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
786 msg))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
787 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
788 (defun checkdoc-recursive-edit (msg) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
789 "Enter recursive edit to permit a user to fix some error checkdoc has found. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
790 MSG is the error that was found, which is displayed in a help buffer." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
791 (with-output-to-temp-buffer "*Checkdoc Help*" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
792 (princ-list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
793 "Error message:\n " msg |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
794 "\n\nEdit to fix this problem, and press C-M-c to continue.")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
795 (shrink-window-if-larger-than-buffer |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
796 (get-buffer-window "*Checkdoc Help*")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
797 (message "When you're done editing press C-M-c to continue.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
798 (unwind-protect |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
799 (recursive-edit) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
800 (if (get-buffer-window "*Checkdoc Help*") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
801 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
802 (delete-window (get-buffer-window "*Checkdoc Help*")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
803 (kill-buffer "*Checkdoc Help*"))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
804 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
805 ;;;###autoload |
20085 | 806 (defun checkdoc-eval-current-buffer () |
807 "Evaluate and check documentation for the current buffer. | |
808 Evaluation is done first because good documentation for something that | |
22195 | 809 doesn't work is just not useful. Comments, doc strings, and rogue |
20085 | 810 spacing are all verified." |
811 (interactive) | |
812 (checkdoc-call-eval-buffer nil) | |
813 (checkdoc-current-buffer t)) | |
814 | |
815 ;;;###autoload | |
816 (defun checkdoc-current-buffer (&optional take-notes) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
817 "Check current buffer for document, comment, error style, and rogue spaces. |
22195 | 818 With a prefix argument (in Lisp, the argument TAKE-NOTES), |
819 store all errors found in a warnings buffer, | |
820 otherwise stop after the first error." | |
20085 | 821 (interactive "P") |
822 (if (interactive-p) (message "Checking buffer for style...")) | |
823 ;; Assign a flag to spellcheck flag | |
824 (let ((checkdoc-spellcheck-documentation-flag | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
825 (memq checkdoc-spellcheck-documentation-flag '(buffer t))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
826 (checkdoc-autofix-flag (if take-notes 'never |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
827 checkdoc-autofix-flag)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
828 (checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
829 (or take-notes checkdoc-generate-compile-warnings-flag))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
830 (if take-notes |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
831 (checkdoc-start-section "checkdoc-current-buffer")) |
20085 | 832 ;; every test is responsible for returning the cursor. |
833 (or (and buffer-file-name ;; only check comments in a file | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
834 (checkdoc-comments)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
835 (checkdoc-start) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
836 (checkdoc-message-text) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
837 (checkdoc-rogue-spaces) |
20085 | 838 (not (interactive-p)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
839 (if take-notes (checkdoc-show-diagnostics)) |
20085 | 840 (message "Checking buffer for style...Done.")))) |
841 | |
842 ;;;###autoload | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
843 (defun checkdoc-start (&optional take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
844 "Start scanning the current buffer for documentation string style errors. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
845 Only documentation strings are checked. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
846 Use `checkdoc-continue' to continue checking if an error cannot be fixed. |
20085 | 847 Prefix argument TAKE-NOTES means to collect all the warning messages into |
848 a separate buffer." | |
849 (interactive "P") | |
850 (let ((p (point))) | |
851 (goto-char (point-min)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
852 (if (and take-notes (interactive-p)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
853 (checkdoc-start-section "checkdoc-start")) |
20085 | 854 (checkdoc-continue take-notes) |
855 ;; Go back since we can't be here without success above. | |
856 (goto-char p) | |
857 nil)) | |
858 | |
859 ;;;###autoload | |
860 (defun checkdoc-continue (&optional take-notes) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
861 "Find the next doc string in the current buffer which has a style error. |
20085 | 862 Prefix argument TAKE-NOTES means to continue through the whole buffer and |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
863 save warnings in a separate buffer. Second optional argument START-POINT |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
864 is the starting location. If this is nil, `point-min' is used instead." |
20085 | 865 (interactive "P") |
866 (let ((wrong nil) (msg nil) (errors nil) | |
867 ;; Assign a flag to spellcheck flag | |
868 (checkdoc-spellcheck-documentation-flag | |
869 (member checkdoc-spellcheck-documentation-flag | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
870 '(buffer t))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
871 (checkdoc-autofix-flag (if take-notes 'never |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
872 checkdoc-autofix-flag)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
873 (checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
874 (or take-notes checkdoc-generate-compile-warnings-flag))) |
20085 | 875 (save-excursion |
876 ;; If we are taking notes, encompass the whole buffer, otherwise | |
877 ;; the user is navigating down through the buffer. | |
878 (while (and (not wrong) (checkdoc-next-docstring)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
879 ;; OK, let's look at the doc string. |
21181 | 880 (setq msg (checkdoc-this-string-valid)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
881 (if msg (setq wrong (point))))) |
20085 | 882 (if wrong |
883 (progn | |
884 (goto-char wrong) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
885 (if (not take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
886 (error (checkdoc-error-text msg))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
887 (checkdoc-show-diagnostics) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
888 (if (interactive-p) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
889 (message "No style warnings.")))) |
20085 | 890 |
891 (defun checkdoc-next-docstring () | |
22195 | 892 "Move to the next doc string after point, and return t. |
893 Return nil if there are no more doc strings." | |
20085 | 894 (if (not (re-search-forward checkdoc-defun-regexp nil t)) |
895 nil | |
896 ;; search drops us after the identifier. The next sexp is either | |
897 ;; the argument list or the value of the variable. skip it. | |
898 (forward-sexp 1) | |
899 (skip-chars-forward " \n\t") | |
900 t)) | |
901 | |
37426 | 902 ;;;###autoload |
20085 | 903 (defun checkdoc-comments (&optional take-notes) |
22195 | 904 "Find missing comment sections in the current Emacs Lisp file. |
20085 | 905 Prefix argument TAKE-NOTES non-nil means to save warnings in a |
906 separate buffer. Otherwise print a message. This returns the error | |
907 if there is one." | |
908 (interactive "P") | |
909 (if take-notes (checkdoc-start-section "checkdoc-comments")) | |
910 (if (not buffer-file-name) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
911 (error "Can only check comments for a file buffer")) |
20085 | 912 (let* ((checkdoc-spellcheck-documentation-flag |
913 (member checkdoc-spellcheck-documentation-flag | |
914 '(buffer t))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
915 (checkdoc-autofix-flag (if take-notes 'never checkdoc-autofix-flag)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
916 (e (checkdoc-file-comments-engine)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
917 (checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
918 (or take-notes checkdoc-generate-compile-warnings-flag))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
919 (if e (error (checkdoc-error-text e))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
920 (checkdoc-show-diagnostics) |
20085 | 921 e)) |
922 | |
923 ;;;###autoload | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
924 (defun checkdoc-rogue-spaces (&optional take-notes interact) |
20085 | 925 "Find extra spaces at the end of lines in the current file. |
926 Prefix argument TAKE-NOTES non-nil means to save warnings in a | |
927 separate buffer. Otherwise print a message. This returns the error | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
928 if there is one. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
929 Optional argument INTERACT permits more interactive fixing." |
20085 | 930 (interactive "P") |
931 (if take-notes (checkdoc-start-section "checkdoc-rogue-spaces")) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
932 (let* ((checkdoc-autofix-flag (if take-notes 'never checkdoc-autofix-flag)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
933 (e (checkdoc-rogue-space-check-engine nil nil interact)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
934 (checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
935 (or take-notes checkdoc-generate-compile-warnings-flag))) |
20085 | 936 (if (not (interactive-p)) |
937 e | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
938 (if e |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
939 (message (checkdoc-error-text e)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
940 (checkdoc-show-diagnostics) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
941 (message "Space Check: done."))))) |
20085 | 942 |
943 ;;;###autoload | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
944 (defun checkdoc-message-text (&optional take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
945 "Scan the buffer for occurrences of the error function, and verify text. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
946 Optional argument TAKE-NOTES causes all errors to be logged." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
947 (interactive "P") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
948 (if take-notes (checkdoc-start-section "checkdoc-message-text")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
949 (let* ((p (point)) e |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
950 (checkdoc-autofix-flag (if take-notes 'never checkdoc-autofix-flag)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
951 (checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
952 (or take-notes checkdoc-generate-compile-warnings-flag))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
953 (setq e (checkdoc-message-text-search)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
954 (if (not (interactive-p)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
955 e |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
956 (if e |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
957 (error (checkdoc-error-text e)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
958 (checkdoc-show-diagnostics))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
959 (goto-char p)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
960 (if (interactive-p) (message "Checking interactive message text...done."))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
961 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
962 ;;;###autoload |
20085 | 963 (defun checkdoc-eval-defun () |
22514
dee11277c07d
(checkdoc-eval-defun): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
22195
diff
changeset
|
964 "Evaluate the current form with `eval-defun' and check its documentation. |
20085 | 965 Evaluation is done first so the form will be read before the |
966 documentation is checked. If there is a documentation error, then the display | |
967 of what was evaluated will be overwritten by the diagnostic message." | |
968 (interactive) | |
969 (eval-defun nil) | |
970 (checkdoc-defun)) | |
971 | |
972 ;;;###autoload | |
973 (defun checkdoc-defun (&optional no-error) | |
22195 | 974 "Examine the doc string of the function or variable under point. |
975 Call `error' if the doc string has problems. If NO-ERROR is | |
20085 | 976 non-nil, then do not call error, but call `message' instead. |
22195 | 977 If the doc string passes the test, then check the function for rogue white |
20085 | 978 space at the end of each line." |
979 (interactive) | |
980 (save-excursion | |
981 (beginning-of-defun) | |
982 (if (not (looking-at checkdoc-defun-regexp)) | |
983 ;; I found this more annoying than useful. | |
984 ;;(if (not no-error) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
985 ;; (message "Cannot check this sexp's doc string.")) |
20085 | 986 nil |
987 ;; search drops us after the identifier. The next sexp is either | |
988 ;; the argument list or the value of the variable. skip it. | |
989 (goto-char (match-end 0)) | |
990 (forward-sexp 1) | |
991 (skip-chars-forward " \n\t") | |
992 (let* ((checkdoc-spellcheck-documentation-flag | |
993 (member checkdoc-spellcheck-documentation-flag | |
994 '(defun t))) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
995 (beg (save-excursion (beginning-of-defun) (point))) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
996 (end (save-excursion (end-of-defun) (point))) |
20085 | 997 (msg (checkdoc-this-string-valid))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
998 (if msg (if no-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
999 (message (checkdoc-error-text msg)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1000 (error (checkdoc-error-text msg))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1001 (setq msg (checkdoc-message-text-search beg end)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1002 (if msg (if no-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1003 (message (checkdoc-error-text msg)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1004 (error (checkdoc-error-text msg))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1005 (setq msg (checkdoc-rogue-space-check-engine beg end)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1006 (if msg (if no-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1007 (message (checkdoc-error-text msg)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1008 (error (checkdoc-error-text msg)))))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1009 (if (interactive-p) (message "Checkdoc: done.")))))) |
20085 | 1010 |
1011 ;;; Ispell interface for forcing a spell check | |
1012 ;; | |
1013 | |
1014 ;;;###autoload | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1015 (defun checkdoc-ispell (&optional take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1016 "Check the style and spelling of everything interactively. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1017 Calls `checkdoc' with spell-checking turned on. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1018 Prefix argument TAKE-NOTES is the same as for `checkdoc'" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1019 (interactive) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1020 (let ((checkdoc-spellcheck-documentation-flag t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1021 (call-interactively 'checkdoc nil current-prefix-arg))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1022 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1023 ;;;###autoload |
20085 | 1024 (defun checkdoc-ispell-current-buffer (&optional take-notes) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1025 "Check the style and spelling of the current buffer. |
20085 | 1026 Calls `checkdoc-current-buffer' with spell-checking turned on. |
1027 Prefix argument TAKE-NOTES is the same as for `checkdoc-current-buffer'" | |
1028 (interactive) | |
1029 (let ((checkdoc-spellcheck-documentation-flag t)) | |
1030 (call-interactively 'checkdoc-current-buffer nil current-prefix-arg))) | |
1031 | |
1032 ;;;###autoload | |
1033 (defun checkdoc-ispell-interactive (&optional take-notes) | |
1034 "Check the style and spelling of the current buffer interactively. | |
1035 Calls `checkdoc-interactive' with spell-checking turned on. | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1036 Prefix argument TAKE-NOTES is the same as for `checkdoc-interactive'" |
20085 | 1037 (interactive) |
1038 (let ((checkdoc-spellcheck-documentation-flag t)) | |
1039 (call-interactively 'checkdoc-interactive nil current-prefix-arg))) | |
1040 | |
1041 ;;;###autoload | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1042 (defun checkdoc-ispell-message-interactive (&optional take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1043 "Check the style and spelling of message text interactively. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1044 Calls `checkdoc-message-interactive' with spell-checking turned on. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1045 Prefix argument TAKE-NOTES is the same as for `checkdoc-message-interactive'" |
20085 | 1046 (interactive) |
1047 (let ((checkdoc-spellcheck-documentation-flag t)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1048 (call-interactively 'checkdoc-message-interactive nil current-prefix-arg))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1049 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1050 ;;;###autoload |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1051 (defun checkdoc-ispell-message-text (&optional take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1052 "Check the style and spelling of message text interactively. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1053 Calls `checkdoc-message-text' with spell-checking turned on. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1054 Prefix argument TAKE-NOTES is the same as for `checkdoc-message-text'" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1055 (interactive) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1056 (let ((checkdoc-spellcheck-documentation-flag t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1057 (call-interactively 'checkdoc-message-text nil current-prefix-arg))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1058 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1059 ;;;###autoload |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1060 (defun checkdoc-ispell-start (&optional take-notes) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1061 "Check the style and spelling of the current buffer. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1062 Calls `checkdoc-start' with spell-checking turned on. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1063 Prefix argument TAKE-NOTES is the same as for `checkdoc-start'" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1064 (interactive) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1065 (let ((checkdoc-spellcheck-documentation-flag t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1066 (call-interactively 'checkdoc-start nil current-prefix-arg))) |
20085 | 1067 |
1068 ;;;###autoload | |
1069 (defun checkdoc-ispell-continue (&optional take-notes) | |
1070 "Check the style and spelling of the current buffer after point. | |
1071 Calls `checkdoc-continue' with spell-checking turned on. | |
1072 Prefix argument TAKE-NOTES is the same as for `checkdoc-continue'" | |
1073 (interactive) | |
1074 (let ((checkdoc-spellcheck-documentation-flag t)) | |
1075 (call-interactively 'checkdoc-continue nil current-prefix-arg))) | |
1076 | |
1077 ;;;###autoload | |
1078 (defun checkdoc-ispell-comments (&optional take-notes) | |
1079 "Check the style and spelling of the current buffer's comments. | |
1080 Calls `checkdoc-comments' with spell-checking turned on. | |
1081 Prefix argument TAKE-NOTES is the same as for `checkdoc-comments'" | |
1082 (interactive) | |
1083 (let ((checkdoc-spellcheck-documentation-flag t)) | |
1084 (call-interactively 'checkdoc-comments nil current-prefix-arg))) | |
1085 | |
1086 ;;;###autoload | |
1087 (defun checkdoc-ispell-defun (&optional take-notes) | |
22195 | 1088 "Check the style and spelling of the current defun with Ispell. |
20085 | 1089 Calls `checkdoc-defun' with spell-checking turned on. |
1090 Prefix argument TAKE-NOTES is the same as for `checkdoc-defun'" | |
1091 (interactive) | |
1092 (let ((checkdoc-spellcheck-documentation-flag t)) | |
1093 (call-interactively 'checkdoc-defun nil current-prefix-arg))) | |
1094 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1095 ;;; Error Management |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1096 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1097 ;; Errors returned from checkdoc functions can have various |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1098 ;; features and behaviors, so we need some ways of specifying |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1099 ;; them, and making them easier to use in the wacked-out interfaces |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1100 ;; people are requesting |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1101 (defun checkdoc-create-error (text start end &optional unfixable) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1102 "Used to create the return error text returned from all engines. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1103 TEXT is the descriptive text of the error. START and END define the region |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1104 it is sensible to highlight when describing the problem. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1105 Optional argument UNFIXABLE means that the error has no auto-fix available. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1106 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1107 A list of the form (TEXT START END UNFIXABLE) is returned if we are not |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1108 generating a buffered list of errors." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1109 (if checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1110 (progn (checkdoc-error start text) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1111 nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1112 (list text start end unfixable))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1113 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1114 (defun checkdoc-error-text (err) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1115 "Return the text specified in the checkdoc ERR." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1116 ;; string-p part is for backwards compatibility |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1117 (if (stringp err) err (car err))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1118 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1119 (defun checkdoc-error-start (err) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1120 "Return the start point specified in the checkdoc ERR." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1121 ;; string-p part is for backwards compatibility |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1122 (if (stringp err) nil (nth 1 err))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1123 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1124 (defun checkdoc-error-end (err) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1125 "Return the end point specified in the checkdoc ERR." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1126 ;; string-p part is for backwards compatibility |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1127 (if (stringp err) nil (nth 2 err))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1128 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1129 (defun checkdoc-error-unfixable (err) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1130 "Return the t if we cannot autofix the error specified in the checkdoc ERR." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1131 ;; string-p part is for backwards compatibility |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1132 (if (stringp err) nil (nth 3 err))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1133 |
20085 | 1134 ;;; Minor Mode specification |
1135 ;; | |
1136 | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1137 (defvar checkdoc-minor-mode-map |
20085 | 1138 (let ((map (make-sparse-keymap)) |
1139 (pmap (make-sparse-keymap))) | |
1140 ;; Override some bindings | |
1141 (define-key map "\C-\M-x" 'checkdoc-eval-defun) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1142 (define-key map "\C-x`" 'checkdoc-continue) |
20085 | 1143 (if (not (string-match "XEmacs" emacs-version)) |
1144 (define-key map [menu-bar emacs-lisp eval-buffer] | |
1145 'checkdoc-eval-current-buffer)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1146 ;; Add some new bindings under C-c ? |
20085 | 1147 (define-key pmap "x" 'checkdoc-defun) |
1148 (define-key pmap "X" 'checkdoc-ispell-defun) | |
1149 (define-key pmap "`" 'checkdoc-continue) | |
1150 (define-key pmap "~" 'checkdoc-ispell-continue) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1151 (define-key pmap "s" 'checkdoc-start) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1152 (define-key pmap "S" 'checkdoc-ispell-start) |
20085 | 1153 (define-key pmap "d" 'checkdoc) |
1154 (define-key pmap "D" 'checkdoc-ispell) | |
1155 (define-key pmap "b" 'checkdoc-current-buffer) | |
1156 (define-key pmap "B" 'checkdoc-ispell-current-buffer) | |
1157 (define-key pmap "e" 'checkdoc-eval-current-buffer) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1158 (define-key pmap "m" 'checkdoc-message-text) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1159 (define-key pmap "M" 'checkdoc-ispell-message-text) |
20085 | 1160 (define-key pmap "c" 'checkdoc-comments) |
1161 (define-key pmap "C" 'checkdoc-ispell-comments) | |
1162 (define-key pmap " " 'checkdoc-rogue-spaces) | |
1163 | |
1164 ;; bind our submap into map | |
1165 (define-key map "\C-c?" pmap) | |
1166 map) | |
1167 "Keymap used to override evaluation key-bindings for documentation checking.") | |
1168 | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1169 (defvar checkdoc-minor-keymap checkdoc-minor-mode-map |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1170 "Obsolete! Use `checkdoc-minor-mode-map'.") |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1171 |
20085 | 1172 ;; Add in a menubar with easy-menu |
1173 | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1174 (easy-menu-define |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1175 checkdoc-minor-menu checkdoc-minor-mode-map "Checkdoc Minor Mode Menu" |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1176 '("CheckDoc" |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1177 ["Interactive Buffer Style Check" checkdoc t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1178 ["Interactive Buffer Style and Spelling Check" checkdoc-ispell t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1179 ["Check Buffer" checkdoc-current-buffer t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1180 ["Check and Spell Buffer" checkdoc-ispell-current-buffer t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1181 "---" |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1182 ["Interactive Style Check" checkdoc-interactive t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1183 ["Interactive Style and Spelling Check" checkdoc-ispell-interactive t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1184 ["Find First Style Error" checkdoc-start t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1185 ["Find First Style or Spelling Error" checkdoc-ispell-start t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1186 ["Next Style Error" checkdoc-continue t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1187 ["Next Style or Spelling Error" checkdoc-ispell-continue t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1188 ["Interactive Message Text Style Check" checkdoc-message-interactive t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1189 ["Interactive Message Text Style and Spelling Check" |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1190 checkdoc-ispell-message-interactive t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1191 ["Check Message Text" checkdoc-message-text t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1192 ["Check and Spell Message Text" checkdoc-ispell-message-text t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1193 ["Check Comment Style" checkdoc-comments buffer-file-name] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1194 ["Check Comment Style and Spelling" checkdoc-ispell-comments |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1195 buffer-file-name] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1196 ["Check for Rogue Spaces" checkdoc-rogue-spaces t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1197 "---" |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1198 ["Check Defun" checkdoc-defun t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1199 ["Check and Spell Defun" checkdoc-ispell-defun t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1200 ["Check and Evaluate Defun" checkdoc-eval-defun t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1201 ["Check and Evaluate Buffer" checkdoc-eval-current-buffer t] |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1202 )) |
20085 | 1203 ;; XEmacs requires some weird stuff to add this menu in a minor mode. |
1204 ;; What is it? | |
1205 | |
1206 ;;;###autoload | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1207 (easy-mmode-define-minor-mode checkdoc-minor-mode |
22195 | 1208 "Toggle Checkdoc minor mode, a mode for checking Lisp doc strings. |
1209 With prefix ARG, turn Checkdoc minor mode on iff ARG is positive. | |
20085 | 1210 |
22195 | 1211 In Checkdoc minor mode, the usual bindings for `eval-defun' which is |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1212 bound to \\<checkdoc-minor-mode-map> \\[checkdoc-eval-defun] and `checkdoc-eval-current-buffer' are overridden to include |
20085 | 1213 checking of documentation strings. |
1214 | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1215 \\{checkdoc-minor-mode-map}" |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1216 nil " CDoc" nil) |
20085 | 1217 |
1218 ;;; Subst utils | |
1219 ;; | |
1220 (defsubst checkdoc-run-hooks (hookvar &rest args) | |
1221 "Run hooks in HOOKVAR with ARGS." | |
1222 (if (fboundp 'run-hook-with-args-until-success) | |
1223 (apply 'run-hook-with-args-until-success hookvar args) | |
1224 ;; This method was similar to above. We ignore the warning | |
22195 | 1225 ;; since we will use the above for future Emacs versions |
20085 | 1226 (apply 'run-hook-with-args hookvar args))) |
1227 | |
1228 (defsubst checkdoc-create-common-verbs-regexp () | |
1229 "Rebuild the contents of `checkdoc-common-verbs-regexp'." | |
1230 (or checkdoc-common-verbs-regexp | |
1231 (setq checkdoc-common-verbs-regexp | |
1232 (concat "\\<\\(" | |
1233 (mapconcat (lambda (e) (concat (car e))) | |
1234 checkdoc-common-verbs-wrong-voice "\\|") | |
1235 "\\)\\>")))) | |
1236 | |
1237 ;; Profiler says this is not yet faster than just calling assoc | |
1238 ;;(defun checkdoc-word-in-alist-vector (word vector) | |
1239 ;; "Check to see if WORD is in the car of an element of VECTOR. | |
1240 ;;VECTOR must be sorted. The CDR should be a replacement. Since the | |
1241 ;;word list is getting bigger, it is time for a quick bisecting search." | |
1242 ;; (let ((max (length vector)) (min 0) i | |
1243 ;; (found nil) (fw nil)) | |
1244 ;; (setq i (/ max 2)) | |
1245 ;; (while (and (not found) (/= min max)) | |
1246 ;; (setq fw (car (aref vector i))) | |
1247 ;; (cond ((string= word fw) (setq found (cdr (aref vector i)))) | |
1248 ;; ((string< word fw) (setq max i)) | |
1249 ;; (t (setq min i))) | |
1250 ;; (setq i (/ (+ max min) 2)) | |
1251 ;; ) | |
1252 ;; found)) | |
1253 | |
1254 ;;; Checking engines | |
1255 ;; | |
1256 (defun checkdoc-this-string-valid () | |
22195 | 1257 "Return a message string if the current doc string is invalid. |
20085 | 1258 Check for style only, such as the first line always being a complete |
1259 sentence, whitespace restrictions, and making sure there are no | |
1260 hard-coded key-codes such as C-[char] or mouse-[number] in the comment. | |
1261 See the style guide in the Emacs Lisp manual for more details." | |
1262 | |
22195 | 1263 ;; Jump over comments between the last object and the doc string |
20085 | 1264 (while (looking-at "[ \t\n]*;") |
1265 (forward-line 1) | |
1266 (beginning-of-line) | |
1267 (skip-chars-forward " \n\t")) | |
1268 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1269 (let ((fp (checkdoc-defun-info)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1270 (err nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1271 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1272 err |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1273 ;; * Every command, function, or variable intended for users to know |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1274 ;; about should have a documentation string. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1275 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1276 ;; * An internal variable or subroutine of a Lisp program might as well |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1277 ;; have a documentation string. In earlier Emacs versions, you could |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1278 ;; save space by using a comment instead of a documentation string, |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1279 ;; but that is no longer the case. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1280 (if (and (not (nth 1 fp)) ; not a variable |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1281 (or (nth 2 fp) ; is interactive |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1282 checkdoc-force-docstrings-flag) ;or we always complain |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1283 (not (checkdoc-char= (following-char) ?\"))) ; no doc string |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1284 ;; Sometimes old code has comments where the documentation should |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1285 ;; be. Let's see if we can find the comment, and offer to turn it |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1286 ;; into documentation for them. |
25697
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
1287 (let ((have-comment nil) |
6060f83b1ffc
(checkdoc-display-status-buffer): Avoid
Dave Love <fx@gnu.org>
parents:
23371
diff
changeset
|
1288 (comment-start ";")) ; in case it's not default |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1289 (condition-case nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1290 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1291 (forward-sexp -1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1292 (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1293 (skip-chars-forward "\n \t") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1294 (setq have-comment (looking-at comment-start))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1295 (error nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1296 (if have-comment |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1297 (if (or (eq checkdoc-autofix-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1298 'automatic-then-never) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1299 (checkdoc-y-or-n-p |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1300 "Convert comment to documentation? ")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1301 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1302 ;; Our point is at the beginning of the comment! |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1303 ;; Insert a quote, then remove the comment chars. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1304 (insert "\"") |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1305 (let ((docstring-start-point (point))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1306 (while (looking-at comment-start) |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1307 (while (looking-at comment-start) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1308 (delete-char 1)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1309 (if (looking-at "[ \t]+") |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1310 (delete-region (match-beginning 0) (match-end 0))) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1311 (forward-line 1) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1312 (beginning-of-line) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1313 (skip-chars-forward " \t") |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1314 (if (looking-at comment-start) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1315 (progn |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1316 (beginning-of-line) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1317 (zap-to-char 1 ?\;)))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1318 (beginning-of-line) |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1319 (forward-char -1) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1320 (insert "\"") |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1321 (forward-char -1) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1322 ;; quote any double-quote characters in the comment. |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1323 (while (search-backward "\"" docstring-start-point t) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1324 (insert "\\")) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1325 (if (eq checkdoc-autofix-flag 'automatic-then-never) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1326 (setq checkdoc-autofix-flag 'never)))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1327 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1328 "You should convert this comment to documentation" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1329 (point) (save-excursion (end-of-line) (point)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1330 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1331 (if (nth 2 fp) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1332 "All interactive functions should have documentation" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1333 "All variables and subroutines might as well have a \ |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1334 documentation string") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1335 (point) (+ (point) 1) t))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1336 (if (and (not err) (looking-at "\"")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1337 (let ((old-syntax-table (syntax-table))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1338 (unwind-protect |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1339 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1340 (set-syntax-table checkdoc-syntax-table) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1341 (checkdoc-this-string-valid-engine fp)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1342 (set-syntax-table old-syntax-table))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1343 err))) |
20085 | 1344 |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1345 (defun checkdoc-this-string-valid-engine (fp) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1346 "Return an error list or string if the current doc string is invalid. |
20085 | 1347 Depends on `checkdoc-this-string-valid' to reset the syntax table so that |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1348 regexp short cuts work. FP is the function defun information." |
20085 | 1349 (let ((case-fold-search nil) |
1350 ;; Use a marker so if an early check modifies the text, | |
1351 ;; we won't accidentally loose our place. This could cause | |
22195 | 1352 ;; end-of doc string whitespace to also delete the " char. |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1353 (s (point)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1354 (e (if (looking-at "\"") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1355 (save-excursion (forward-sexp 1) (point-marker)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1356 (point)))) |
20085 | 1357 (or |
1358 ;; * *Do not* indent subsequent lines of a documentation string so that | |
1359 ;; the text is lined up in the source code with the text of the first | |
1360 ;; line. This looks nice in the source code, but looks bizarre when | |
1361 ;; users view the documentation. Remember that the indentation | |
1362 ;; before the starting double-quote is not part of the string! | |
1363 (save-excursion | |
1364 (forward-line 1) | |
1365 (beginning-of-line) | |
1366 (if (and (< (point) e) | |
1367 (looking-at "\\([ \t]+\\)[^ \t\n]")) | |
1368 (if (checkdoc-autofix-ask-replace (match-beginning 1) | |
1369 (match-end 1) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1370 "Remove this whitespace? " |
20085 | 1371 "") |
1372 nil | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1373 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1374 "Second line should not have indentation" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1375 (match-beginning 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1376 (match-end 1))))) |
20085 | 1377 ;; * Do not start or end a documentation string with whitespace. |
1378 (let (start end) | |
1379 (if (or (if (looking-at "\"\\([ \t\n]+\\)") | |
1380 (setq start (match-beginning 1) | |
1381 end (match-end 1))) | |
1382 (save-excursion | |
1383 (forward-sexp 1) | |
1384 (forward-char -1) | |
1385 (if (/= (skip-chars-backward " \t\n") 0) | |
1386 (setq start (point) | |
1387 end (1- e))))) | |
1388 (if (checkdoc-autofix-ask-replace | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1389 start end "Remove this whitespace? " "") |
20085 | 1390 nil |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1391 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1392 "Documentation strings should not start or end with whitespace" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1393 start end)))) |
20085 | 1394 ;; * The first line of the documentation string should consist of one |
1395 ;; or two complete sentences that stand on their own as a summary. | |
1396 ;; `M-x apropos' displays just the first line, and if it doesn't | |
1397 ;; stand on its own, the result looks bad. In particular, start the | |
1398 ;; first line with a capital letter and end with a period. | |
1399 (save-excursion | |
1400 (end-of-line) | |
1401 (skip-chars-backward " \t\n") | |
1402 (if (> (point) e) (goto-char e)) ;of the form (defun n () "doc" nil) | |
1403 (forward-char -1) | |
1404 (cond | |
1405 ((and (checkdoc-char= (following-char) ?\") | |
1406 ;; A backslashed double quote at the end of a sentence | |
1407 (not (checkdoc-char= (preceding-char) ?\\))) | |
1408 ;; We might have to add a period in this case | |
1409 (forward-char -1) | |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1410 (if (looking-at "[.!?]") |
20085 | 1411 nil |
1412 (forward-char 1) | |
1413 (if (checkdoc-autofix-ask-replace | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1414 (point) (1+ (point)) "Add period to sentence? " |
20085 | 1415 ".\"" t) |
1416 nil | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1417 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1418 "First sentence should end with punctuation" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1419 (point) (1+ (point)))))) |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1420 ((looking-at "[\\!?;:.)]") |
20085 | 1421 ;; These are ok |
1422 nil) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1423 ((and checkdoc-permit-comma-termination-flag (looking-at ",")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1424 nil) |
20085 | 1425 (t |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1426 ;; If it is not a complete sentence, let's see if we can |
20085 | 1427 ;; predict a clever way to make it one. |
1428 (let ((msg "First line is not a complete sentence") | |
1429 (e (point))) | |
1430 (beginning-of-line) | |
1431 (if (re-search-forward "\\. +" e t) | |
1432 ;; Here we have found a complete sentence, but no break. | |
1433 (if (checkdoc-autofix-ask-replace | |
1434 (1+ (match-beginning 0)) (match-end 0) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1435 "First line not a complete sentence. Add RET here? " |
20085 | 1436 "\n" t) |
1437 (let (l1 l2) | |
1438 (forward-line 1) | |
1439 (end-of-line) | |
1440 (setq l1 (current-column) | |
1441 l2 (save-excursion | |
1442 (forward-line 1) | |
1443 (end-of-line) | |
1444 (current-column))) | |
1445 (if (> (+ l1 l2 1) 80) | |
22195 | 1446 (setq msg "Incomplete auto-fix; doc string \ |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1447 may require more formatting") |
20085 | 1448 ;; We can merge these lines! Replace this CR |
1449 ;; with a space. | |
1450 (delete-char 1) (insert " ") | |
1451 (setq msg nil)))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1452 ;; Let's see if there is enough room to draw the next |
20085 | 1453 ;; line's sentence up here. I often get hit w/ |
1454 ;; auto-fill moving my words around. | |
1455 (let ((numc (progn (end-of-line) (- 80 (current-column)))) | |
1456 (p (point))) | |
1457 (forward-line 1) | |
1458 (beginning-of-line) | |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1459 (if (and (re-search-forward "[.!?:\"]\\([ \t\n]+\\|\"\\)" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1460 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1461 (end-of-line) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1462 (point)) |
20085 | 1463 t) |
1464 (< (current-column) numc)) | |
1465 (if (checkdoc-autofix-ask-replace | |
1466 p (1+ p) | |
22195 | 1467 "1st line not a complete sentence. Join these lines? " |
20085 | 1468 " " t) |
1469 (progn | |
1470 ;; They said yes. We have more fill work to do... | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1471 (goto-char (match-beginning 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1472 (delete-region (point) (match-end 1)) |
20085 | 1473 (insert "\n") |
1474 (setq msg nil)))))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1475 (if msg |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1476 (checkdoc-create-error msg s (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1477 (goto-char s) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1478 (end-of-line) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1479 (point))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1480 nil) )))) |
20085 | 1481 ;; Continuation of above. Make sure our sentence is capitalized. |
1482 (save-excursion | |
1483 (skip-chars-forward "\"\\*") | |
1484 (if (looking-at "[a-z]") | |
1485 (if (checkdoc-autofix-ask-replace | |
1486 (match-beginning 0) (match-end 0) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1487 "Capitalize your sentence? " (upcase (match-string 0)) |
20085 | 1488 t) |
1489 nil | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1490 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1491 "First line should be capitalized" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1492 (match-beginning 0) (match-end 0))) |
20085 | 1493 nil)) |
1494 ;; * Don't write key sequences directly in documentation strings. | |
1495 ;; Instead, use the `\\[...]' construct to stand for them. | |
1496 (save-excursion | |
1497 (let ((f nil) (m nil) (start (point)) | |
21181 | 1498 (re "[^`A-Za-z0-9_]\\([CMA]-[a-zA-Z]\\|\\(\\([CMA]-\\)?\ |
20085 | 1499 mouse-[0-3]\\)\\)\\>")) |
1500 ;; Find the first key sequence not in a sample | |
1501 (while (and (not f) (setq m (re-search-forward re e t))) | |
1502 (setq f (not (checkdoc-in-sample-code-p start e)))) | |
1503 (if m | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1504 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1505 (concat |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1506 "Keycode " (match-string 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1507 " embedded in doc string. Use \\\\<keymap> & \\\\[function] " |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1508 "instead") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1509 (match-beginning 1) (match-end 1) t)))) |
20085 | 1510 ;; It is not practical to use `\\[...]' very many times, because |
1511 ;; display of the documentation string will become slow. So use this | |
1512 ;; to describe the most important commands in your major mode, and | |
1513 ;; then use `\\{...}' to display the rest of the mode's keymap. | |
1514 (save-excursion | |
1515 (if (re-search-forward "\\\\\\\\\\[\\w+" e t | |
1516 (1+ checkdoc-max-keyref-before-warn)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1517 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1518 "Too many occurrences of \\[function]. Use \\{keymap} instead" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1519 s (marker-position e)))) |
22195 | 1520 ;; Ambiguous quoted symbol. When a symbol is both bound and fbound, |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1521 ;; and is referred to in documentation, it should be prefixed with |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1522 ;; something to disambiguate it. This check must be before the |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1523 ;; 80 column check because it will probably break that. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1524 (save-excursion |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1525 (let ((case-fold-search t) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1526 (ret nil) mb me) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1527 (while (and (re-search-forward "`\\(\\sw\\(\\sw\\|\\s_\\)+\\)'" e t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1528 (not ret)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1529 (let* ((ms1 (match-string 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1530 (sym (intern-soft ms1))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1531 (setq mb (match-beginning 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1532 me (match-end 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1533 (if (and sym (boundp sym) (fboundp sym) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1534 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1535 (goto-char mb) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1536 (forward-word -1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1537 (not (looking-at |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1538 "variable\\|option\\|function\\|command\\|symbol")))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1539 (if (checkdoc-autofix-ask-replace |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1540 mb me "Prefix this ambiguous symbol? " ms1 t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1541 ;; We didn't actually replace anything. Here we find |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1542 ;; out what special word form they wish to use as |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1543 ;; a prefix. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1544 (let ((disambiguate |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1545 (completing-read |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1546 "Disambiguating Keyword (default: variable): " |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1547 '(("function") ("command") ("variable") |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1548 ("option") ("symbol")) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1549 nil t nil nil "variable"))) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1550 (goto-char (1- mb)) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1551 (insert disambiguate " ") |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1552 (forward-word 1)) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1553 (setq ret |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1554 (format "Disambiguate %s by preceding w/ \ |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1555 function,command,variable,option or symbol." ms1)))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1556 (if ret |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1557 (checkdoc-create-error ret mb me) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1558 nil))) |
20085 | 1559 ;; * Format the documentation string so that it fits in an |
1560 ;; Emacs window on an 80-column screen. It is a good idea | |
1561 ;; for most lines to be no wider than 60 characters. The | |
1562 ;; first line can be wider if necessary to fit the | |
1563 ;; information that ought to be there. | |
1564 (save-excursion | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1565 (let ((start (point)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1566 (eol nil)) |
20085 | 1567 (while (and (< (point) e) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1568 (or (progn (end-of-line) (setq eol (point)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1569 (< (current-column) 80)) |
20085 | 1570 (progn (beginning-of-line) |
1571 (re-search-forward "\\\\\\\\[[<{]" | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1572 eol t)) |
20085 | 1573 (checkdoc-in-sample-code-p start e))) |
1574 (forward-line 1)) | |
1575 (end-of-line) | |
1576 (if (and (< (point) e) (> (current-column) 80)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1577 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1578 "Some lines are over 80 columns wide" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1579 s (save-excursion (goto-char s) (end-of-line) (point)) )))) |
20085 | 1580 ;; Here we deviate to tests based on a variable or function. |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1581 ;; We must do this before checking for symbols in quotes because there |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1582 ;; is a chance that just such a symbol might really be an argument. |
20085 | 1583 (cond ((eq (nth 1 fp) t) |
1584 ;; This is if we are in a variable | |
1585 (or | |
1586 ;; * The documentation string for a variable that is a | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1587 ;; yes-or-no flag should start with words such as Non-nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1588 ;; means..., to make it clear that all non-`nil' values are |
20085 | 1589 ;; equivalent and indicate explicitly what `nil' and non-`nil' |
1590 ;; mean. | |
1591 ;; * If a user option variable records a true-or-false | |
1592 ;; condition, give it a name that ends in `-flag'. | |
1593 | |
1594 ;; If the variable has -flag in the name, make sure | |
1595 (if (and (string-match "-flag$" (car fp)) | |
1596 (not (looking-at "\"\\*?Non-nil\\s-+means\\s-+"))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1597 (checkdoc-create-error |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1598 "Flag variable doc strings should usually start: Non-nil means" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1599 s (marker-position e) t)) |
22195 | 1600 ;; If the doc string starts with "Non-nil means" |
20085 | 1601 (if (and (looking-at "\"\\*?Non-nil\\s-+means\\s-+") |
1602 (not (string-match "-flag$" (car fp)))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1603 (if (checkdoc-y-or-n-p |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1604 (format |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1605 "Rename to %s and Query-Replace all occurances? " |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1606 (concat (car fp) "-flag"))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1607 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1608 (beginning-of-defun) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1609 (query-replace-regexp |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1610 (concat "\\<" (regexp-quote (car fp)) "\\>") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1611 (concat (car fp) "-flag"))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1612 (checkdoc-create-error |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1613 "Flag variable names should normally end in `-flag'" s |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1614 (marker-position e)))) |
20085 | 1615 ;; Done with variables |
1616 )) | |
1617 (t | |
1618 ;; This if we are in a function definition | |
1619 (or | |
1620 ;; * When a function's documentation string mentions the value | |
1621 ;; of an argument of the function, use the argument name in | |
1622 ;; capital letters as if it were a name for that value. Thus, | |
1623 ;; the documentation string of the function `/' refers to its | |
1624 ;; second argument as `DIVISOR', because the actual argument | |
1625 ;; name is `divisor'. | |
1626 | |
1627 ;; Addendum: Make sure they appear in the doc in the same | |
1628 ;; order that they are found in the arg list. | |
1629 (let ((args (cdr (cdr (cdr (cdr fp))))) | |
1630 (last-pos 0) | |
1631 (found 1) | |
1632 (order (and (nth 3 fp) (car (nth 3 fp)))) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1633 (nocheck (append '("&optional" "&rest") (nth 3 fp))) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1634 (inopts nil)) |
20085 | 1635 (while (and args found (> found last-pos)) |
1636 (if (member (car args) nocheck) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1637 (setq args (cdr args) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1638 inopts t) |
20085 | 1639 (setq last-pos found |
1640 found (save-excursion | |
1641 (re-search-forward | |
1642 (concat "\\<" (upcase (car args)) | |
1643 ;; Require whitespace OR | |
1644 ;; ITEMth<space> OR | |
1645 ;; ITEMs<space> | |
1646 "\\(\\>\\|th\\>\\|s\\>\\)") | |
1647 e t))) | |
1648 (if (not found) | |
1649 (let ((case-fold-search t)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1650 ;; If the symbol was not found, let's see if we |
20085 | 1651 ;; can find it with a different capitalization |
1652 ;; and see if the user wants to capitalize it. | |
1653 (if (save-excursion | |
1654 (re-search-forward | |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1655 (concat "\\<\\(" (car args) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1656 ;; Require whitespace OR |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1657 ;; ITEMth<space> OR |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1658 ;; ITEMs<space> |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1659 "\\)\\(\\>\\|th\\>\\|s\\>\\)") |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1660 e t)) |
20085 | 1661 (if (checkdoc-autofix-ask-replace |
1662 (match-beginning 1) (match-end 1) | |
1663 (format | |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1664 "If this is the argument `%s', it should appear as %s. Fix? " |
20085 | 1665 (car args) (upcase (car args))) |
1666 (upcase (car args)) t) | |
1667 (setq found (match-beginning 1)))))) | |
1668 (if found (setq args (cdr args))))) | |
1669 (if (not found) | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1670 ;; It wasn't found at all! Offer to attach this new symbol |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1671 ;; to the end of the documentation string. |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1672 (if (checkdoc-y-or-n-p |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1673 (format |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1674 "Add %s documentation to end of doc string? " |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1675 (upcase (car args)))) |
22195 | 1676 ;; Now do some magic and invent a doc string. |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1677 (save-excursion |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1678 (goto-char e) (forward-char -1) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1679 (insert "\n" |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1680 (if inopts "Optional a" "A") |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1681 "rgument " (upcase (car args)) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1682 " ") |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1683 (insert (read-string "Describe: ")) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1684 (if (not (save-excursion (forward-char -1) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1685 (looking-at "[.?!]"))) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1686 (insert ".")) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
1687 nil) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1688 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1689 (format |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1690 "Argument `%s' should appear (as %s) in the doc string" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1691 (car args) (upcase (car args))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1692 s (marker-position e))) |
20085 | 1693 (if (or (and order (eq order 'yes)) |
1694 (and (not order) checkdoc-arguments-in-order-flag)) | |
1695 (if (< found last-pos) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1696 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1697 "Arguments occur in the doc string out of order" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1698 s (marker-position e) t))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1699 ;; * For consistency, phrase the verb in the first sentence of a |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1700 ;; documentation string for functions as an imperative. |
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1701 ;; For instance, use `Return the cons of A and |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1702 ;; B.' in preference to `Returns the cons of A and B.' |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1703 ;; Usually it looks good to do likewise for the rest of the |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1704 ;; first paragraph. Subsequent paragraphs usually look better |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1705 ;; if they have proper subjects. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1706 ;; |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1707 ;; This is the least important of the above tests. Make sure |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1708 ;; it occurs last. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1709 (and checkdoc-verb-check-experimental-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1710 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1711 ;; Maybe rebuild the monster-regex |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1712 (checkdoc-create-common-verbs-regexp) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1713 (let ((lim (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1714 (end-of-line) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1715 ;; check string-continuation |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1716 (if (checkdoc-char= (preceding-char) ?\\) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1717 (progn (forward-line 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1718 (end-of-line))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1719 (point))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1720 (rs nil) replace original (case-fold-search t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1721 (while (and (not rs) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1722 (re-search-forward |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1723 checkdoc-common-verbs-regexp |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1724 lim t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1725 (setq original (buffer-substring-no-properties |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1726 (match-beginning 1) (match-end 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1727 rs (assoc (downcase original) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1728 checkdoc-common-verbs-wrong-voice)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1729 (if (not rs) (error "Verb voice alist corrupted")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1730 (setq replace (let ((case-fold-search nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1731 (save-match-data |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1732 (if (string-match "^[A-Z]" original) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1733 (capitalize (cdr rs)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1734 (cdr rs))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1735 (if (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1736 (match-beginning 1) (match-end 1) |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1737 (format "Use the imperative for \"%s\". \ |
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1738 Replace with \"%s\"? " original replace) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1739 replace t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1740 (setq rs nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1741 (if rs |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1742 ;; there was a match, but no replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1743 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1744 (format |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1745 "Probably \"%s\" should be imperative \"%s\"" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1746 original replace) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1747 (match-beginning 1) (match-end 1)))))) |
20085 | 1748 ;; Done with functions |
1749 ))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1750 ;;* When a documentation string refers to a Lisp symbol, write it as |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1751 ;; it would be printed (which usually means in lower case), with |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1752 ;; single-quotes around it. For example: `lambda'. There are two |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1753 ;; exceptions: write t and nil without single-quotes. (In this |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1754 ;; manual, we normally do use single-quotes for those symbols.) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1755 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1756 (let ((found nil) (start (point)) (msg nil) (ms nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1757 (while (and (not msg) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1758 (re-search-forward |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1759 "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^]']" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1760 e t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1761 (setq ms (match-string 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1762 (save-match-data |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1763 ;; A . is a \s_ char, so we must remove periods from |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1764 ;; sentences more carefully. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1765 (if (string-match "\\.$" ms) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1766 (setq ms (substring ms 0 (1- (length ms)))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1767 (if (and (not (checkdoc-in-sample-code-p start e)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1768 (not (checkdoc-in-example-string-p start e)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1769 (not (member ms checkdoc-symbol-words)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1770 (setq found (intern-soft ms)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1771 (or (boundp found) (fboundp found))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1772 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1773 (setq msg (format "Add quotes around Lisp symbol `%s'? " |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1774 ms)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1775 (if (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1776 (match-beginning 1) (+ (match-beginning 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1777 (length ms)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1778 msg (concat "`" ms "'") t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1779 (setq msg nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1780 (setq msg |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1781 (format "Lisp symbol `%s' should appear in quotes" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1782 ms)))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1783 (if msg |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1784 (checkdoc-create-error msg (match-beginning 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1785 (+ (match-beginning 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1786 (length ms))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1787 nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1788 ;; t and nil case |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1789 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1790 (if (re-search-forward "\\(`\\(t\\|nil\\)'\\)" e t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1791 (if (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1792 (match-beginning 1) (match-end 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1793 (format "%s should not appear in quotes. Remove? " |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1794 (match-string 2)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1795 (match-string 2) t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1796 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1797 (checkdoc-create-error |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
1798 "Symbols t and nil should not appear in `...' quotes" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1799 (match-beginning 1) (match-end 1))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1800 ;; Here is some basic sentence formatting |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1801 (checkdoc-sentencespace-region-engine (point) e) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1802 ;; Here are common proper nouns that should always appear capitalized. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1803 (checkdoc-proper-noun-region-engine (point) e) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1804 ;; Make sure the doc string has correctly spelled English words |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1805 ;; in it. This function is extracted due to its complexity, |
22195 | 1806 ;; and reliance on the Ispell program. |
20085 | 1807 (checkdoc-ispell-docstring-engine e) |
1808 ;; User supplied checks | |
1809 (save-excursion (checkdoc-run-hooks 'checkdoc-style-hooks fp e)) | |
1810 ;; Done! | |
1811 ))) | |
1812 | |
1813 (defun checkdoc-defun-info nil | |
1814 "Return a list of details about the current sexp. | |
1815 It is a list of the form: | |
22195 | 1816 (NAME VARIABLE INTERACTIVE NODOCPARAMS PARAMETERS ...) |
20085 | 1817 where NAME is the name, VARIABLE is t if this is a `defvar', |
1818 INTERACTIVE is nil if this is not an interactive function, otherwise | |
1819 it is the position of the `interactive' call, and PARAMETERS is a | |
1820 string which is the name of each variable in the function's argument | |
1821 list. The NODOCPARAMS is a sublist of parameters specified by a checkdoc | |
1822 comment for a given defun. If the first element is not a string, then | |
1823 the token checkdoc-order: <TOKEN> exists, and TOKEN is a symbol read | |
1824 from the comment." | |
1825 (save-excursion | |
1826 (beginning-of-defun) | |
1827 (let ((defun (looking-at "(def\\(un\\|macro\\|subst\\|advice\\)")) | |
1828 (is-advice (looking-at "(defadvice")) | |
1829 (lst nil) | |
1830 (ret nil) | |
1831 (oo (make-vector 3 0))) ;substitute obarray for `read' | |
1832 (forward-char 1) | |
1833 (forward-sexp 1) | |
1834 (skip-chars-forward " \n\t") | |
1835 (setq ret | |
1836 (list (buffer-substring-no-properties | |
1837 (point) (progn (forward-sexp 1) (point))))) | |
1838 (if (not defun) | |
1839 (setq ret (cons t ret)) | |
1840 ;; The variable spot | |
1841 (setq ret (cons nil ret)) | |
1842 ;; Interactive | |
1843 (save-excursion | |
1844 (setq ret (cons | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
1845 (re-search-forward "^\\s-*(interactive" |
20085 | 1846 (save-excursion (end-of-defun) (point)) |
1847 t) | |
1848 ret))) | |
1849 (skip-chars-forward " \t\n") | |
1850 (let ((bss (buffer-substring (point) (save-excursion (forward-sexp 1) | |
1851 (point)))) | |
1852 ;; Overload th main obarray so read doesn't intern the | |
1853 ;; local symbols of the function we are checking. | |
1854 ;; Without this we end up cluttering the symbol space w/ | |
1855 ;; useless symbols. | |
1856 (obarray oo)) | |
1857 ;; Ok, check for checkdoc parameter comment here | |
1858 (save-excursion | |
1859 (setq ret | |
1860 (cons | |
1861 (let ((sl1 nil)) | |
1862 (if (re-search-forward ";\\s-+checkdoc-order:\\s-+" | |
1863 (save-excursion (end-of-defun) | |
1864 (point)) | |
1865 t) | |
1866 (setq sl1 (list (cond ((looking-at "nil") 'no) | |
1867 ((looking-at "t") 'yes))))) | |
1868 (if (re-search-forward ";\\s-+checkdoc-params:\\s-+" | |
1869 (save-excursion (end-of-defun) | |
1870 (point)) | |
1871 t) | |
1872 (let ((sl nil)) | |
1873 (goto-char (match-end 0)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1874 (condition-case nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1875 (setq lst (read (current-buffer))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1876 (error (setq lst nil))) ; error in text |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1877 (if (not (listp lst)) ; not a list of args |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1878 (setq lst (list lst))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1879 (if (and lst (not (symbolp (car lst)))) ;weird arg |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1880 (setq lst nil)) |
20085 | 1881 (while lst |
1882 (setq sl (cons (symbol-name (car lst)) sl) | |
1883 lst (cdr lst))) | |
1884 (setq sl1 (append sl1 sl)))) | |
1885 sl1) | |
1886 ret))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1887 ;; Read the list of parameters, but do not put the symbols in |
20085 | 1888 ;; the standard obarray. |
1889 (setq lst (read bss))) | |
1890 ;; This is because read will intern nil if it doesn't into the | |
1891 ;; new obarray. | |
1892 (if (not (listp lst)) (setq lst nil)) | |
1893 (if is-advice nil | |
1894 (while lst | |
1895 (setq ret (cons (symbol-name (car lst)) ret) | |
1896 lst (cdr lst))))) | |
1897 (nreverse ret)))) | |
1898 | |
1899 (defun checkdoc-in-sample-code-p (start limit) | |
22195 | 1900 "Return non-nil if the current point is in a code fragment. |
20085 | 1901 A code fragment is identified by an open parenthesis followed by a |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1902 symbol which is a valid function or a word in all CAPS, or a parenthesis |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1903 that is quoted with the ' character. Only the region from START to LIMIT |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1904 is is allowed while searching for the bounding parenthesis." |
20085 | 1905 (save-match-data |
1906 (save-restriction | |
1907 (narrow-to-region start limit) | |
1908 (save-excursion | |
1909 (and (condition-case nil (progn (up-list 1) t) (error nil)) | |
1910 (condition-case nil (progn (forward-list -1) t) (error nil)) | |
1911 (or (save-excursion (forward-char -1) (looking-at "'(")) | |
1912 (and (looking-at "(\\(\\(\\w\\|[-:_]\\)+\\)[ \t\n;]") | |
1913 (let ((ms (buffer-substring-no-properties | |
1914 (match-beginning 1) (match-end 1)))) | |
1915 ;; if this string is function bound, we are in | |
1916 ;; sample code. If it has a - or : character in | |
1917 ;; the name, then it is probably supposed to be bound | |
1918 ;; but isn't yet. | |
1919 (or (fboundp (intern-soft ms)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1920 (let ((case-fold-search nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1921 (string-match "^[A-Z-]+$" ms)) |
20085 | 1922 (string-match "\\w[-:_]+\\w" ms)))))))))) |
1923 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1924 (defun checkdoc-in-example-string-p (start limit) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1925 "Return non-nil if the current point is in an \"example string\". |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1926 This string is identified by the characters \\\" surrounding the text. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1927 The text checked is between START and LIMIT." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1928 (save-match-data |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1929 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1930 (let ((p (point)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1931 (c 0)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1932 (goto-char start) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1933 (while (and (< (point) p) (re-search-forward "\\\\\"" limit t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1934 (setq c (1+ c))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1935 (and (< 0 c) (= (% c 2) 0)))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1936 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1937 (defun checkdoc-proper-noun-region-engine (begin end) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1938 "Check all text between BEGIN and END for lower case proper nouns. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1939 These are Emacs centric proper nouns which should be capitalized for |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1940 consistency. Return an error list if any are not fixed, but |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1941 internally skip over no answers. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1942 If the offending word is in a piece of quoted text, then it is skipped." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1943 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1944 (let ((case-fold-search nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1945 (errtxt nil) bb be |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1946 (old-syntax-table (syntax-table))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1947 (unwind-protect |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1948 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1949 (set-syntax-table checkdoc-syntax-table) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1950 (goto-char begin) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1951 (while (re-search-forward checkdoc-proper-noun-regexp end t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1952 (let ((text (match-string 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1953 (b (match-beginning 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1954 (e (match-end 1))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1955 (if (and (not (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1956 (goto-char b) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1957 (forward-char -1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1958 (looking-at "`\\|\"\\|\\.\\|\\\\"))) |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1959 ;; surrounded by /, as in a URL or filename: /emacs/ |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1960 (not (and (= ?/ (char-after e)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1961 (= ?/ (char-before b)))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1962 (not (checkdoc-in-example-string-p begin end))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1963 (if (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1964 b e (format "Text %s should be capitalized. Fix? " |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1965 text) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1966 (capitalize text) t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1967 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1968 (if errtxt |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1969 ;; If there is already an error, then generate |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1970 ;; the warning output if applicable |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1971 (if checkdoc-generate-compile-warnings-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1972 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1973 (format |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1974 "Name %s should appear capitalized as %s" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1975 text (capitalize text)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1976 b e)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1977 (setq errtxt |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1978 (format |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1979 "Name %s should appear capitalized as %s" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1980 text (capitalize text)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1981 bb b be e))))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1982 (set-syntax-table old-syntax-table)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1983 (if errtxt (checkdoc-create-error errtxt bb be))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1984 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1985 (defun checkdoc-sentencespace-region-engine (begin end) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
1986 "Make sure all sentences have double spaces between BEGIN and END." |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1987 (if sentence-end-double-space |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1988 (save-excursion |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1989 (let ((case-fold-search nil) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1990 (errtxt nil) bb be |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1991 (old-syntax-table (syntax-table))) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1992 (unwind-protect |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1993 (progn |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1994 (set-syntax-table checkdoc-syntax-table) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1995 (goto-char begin) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1996 (while (re-search-forward "[^.0-9]\\(\\. \\)[^ \n]" end t) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1997 (let ((b (match-beginning 1)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1998 (e (match-end 1))) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
1999 (if (and (not (checkdoc-in-sample-code-p begin end)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2000 (not (checkdoc-in-example-string-p begin end)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2001 (not (save-excursion |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2002 (goto-char (match-beginning 1)) |
23371
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2003 (condition-case nil |
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2004 (progn |
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2005 (forward-sexp -1) |
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2006 ;; piece of an abbreviation |
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2007 (looking-at |
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2008 "\\([a-z]\\|[iI]\\.?e\\|[eE]\\.?g\\)\\.")) |
9808edcd3c95
(checkdoc-sentencespace-region-engine): Protect a `forward-sexp' call
Eric M. Ludlam <zappo@gnu.org>
parents:
23192
diff
changeset
|
2009 (error t))))) |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2010 (if (checkdoc-autofix-ask-replace |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2011 b e |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2012 "There should be two spaces after a period. Fix? " |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2013 ". ") |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2014 nil |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2015 (if errtxt |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2016 ;; If there is already an error, then generate |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2017 ;; the warning output if applicable |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2018 (if checkdoc-generate-compile-warnings-flag |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2019 (checkdoc-create-error |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2020 "There should be two spaces after a period" |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2021 b e)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2022 (setq errtxt |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2023 "There should be two spaces after a period" |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2024 bb b be e))))))) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2025 (set-syntax-table old-syntax-table)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2026 (if errtxt (checkdoc-create-error errtxt bb be)))))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2027 |
20085 | 2028 ;;; Ispell engine |
2029 ;; | |
2030 (eval-when-compile (require 'ispell)) | |
2031 | |
2032 (defun checkdoc-ispell-init () | |
22195 | 2033 "Initialize Ispell process (default version) with Lisp words. |
20085 | 2034 The words used are from `checkdoc-ispell-lisp-words'. If `ispell' |
2035 cannot be loaded, then set `checkdoc-spellcheck-documentation-flag' to | |
2036 nil." | |
2037 (require 'ispell) | |
2038 (if (not (symbol-value 'ispell-process)) ;Silence byteCompiler | |
2039 (condition-case nil | |
2040 (progn | |
2041 (ispell-buffer-local-words) | |
22195 | 2042 ;; This code copied in part from ispell.el Emacs 19.34 |
20085 | 2043 (let ((w checkdoc-ispell-lisp-words)) |
2044 (while w | |
2045 (process-send-string | |
2046 ;; Silence byte compiler | |
2047 (symbol-value 'ispell-process) | |
2048 (concat "@" (car w) "\n")) | |
2049 (setq w (cdr w))))) | |
2050 (error (setq checkdoc-spellcheck-documentation-flag nil))))) | |
2051 | |
2052 (defun checkdoc-ispell-docstring-engine (end) | |
22195 | 2053 "Run the Ispell tools on the doc string between point and END. |
2054 Since Ispell isn't Lisp-smart, we must pre-process the doc string | |
2055 before using the Ispell engine on it." | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2056 (if (or (not checkdoc-spellcheck-documentation-flag) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2057 ;; If the user wants no questions or fixing, then we must |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2058 ;; disable spell checking as not useful. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2059 (not checkdoc-autofix-flag) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2060 (eq checkdoc-autofix-flag 'never)) |
20085 | 2061 nil |
2062 (checkdoc-ispell-init) | |
2063 (save-excursion | |
2064 (skip-chars-forward "^a-zA-Z") | |
2065 (let ((word nil) (sym nil) (case-fold-search nil) (err nil)) | |
2066 (while (and (not err) (< (point) end)) | |
2067 (if (save-excursion (forward-char -1) (looking-at "[('`]")) | |
2068 ;; Skip lists describing meta-syntax, or bound variables | |
2069 (forward-sexp 1) | |
2070 (setq word (buffer-substring-no-properties | |
2071 (point) (progn | |
2072 (skip-chars-forward "a-zA-Z-") | |
2073 (point))) | |
2074 sym (intern-soft word)) | |
2075 (if (and sym (or (boundp sym) (fboundp sym))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2076 ;; This is probably repetitive in most cases, but not always. |
20085 | 2077 nil |
2078 ;; Find out how we spell-check this word. | |
2079 (if (or | |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
2080 ;; All caps w/ option th, or s tacked on the end |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2081 ;; for pluralization or numberthness. |
20603
24dda0afd915
Added some more comments in the commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
20085
diff
changeset
|
2082 (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word) |
20085 | 2083 (looking-at "}") ; a keymap expression |
2084 ) | |
2085 nil | |
2086 (save-excursion | |
2087 (if (not (eq checkdoc-autofix-flag 'never)) | |
2088 (let ((lk last-input-event)) | |
2089 (ispell-word nil t) | |
2090 (if (not (equal last-input-event lk)) | |
2091 (progn | |
2092 (sit-for 0) | |
2093 (message "Continuing...")))) | |
2094 ;; Nothing here. | |
2095 ))))) | |
2096 (skip-chars-forward "^a-zA-Z")) | |
2097 err)))) | |
2098 | |
2099 ;;; Rogue space checking engine | |
2100 ;; | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2101 (defun checkdoc-rogue-space-check-engine (&optional start end interact) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2102 "Return a message list if there is a line with white space at the end. |
20085 | 2103 If `checkdoc-autofix-flag' permits, delete that whitespace instead. |
2104 If optional arguments START and END are non nil, bound the check to | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2105 this region. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2106 Optional argument INTERACT may permit the user to fix problems on the fly." |
20085 | 2107 (let ((p (point)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2108 (msg nil) s e (f nil)) |
20085 | 2109 (if (not start) (setq start (point-min))) |
2110 ;; If end is nil, it means end of buffer to search anyway | |
2111 (or | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2112 ;; Check for an error if `? ' or `?\ ' is used at the end of a line. |
20085 | 2113 ;; (It's dangerous) |
2114 (progn | |
2115 (goto-char start) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2116 (while (and (not msg) (re-search-forward "\\?\\\\?[ \t][ \t]*$" end t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2117 (setq msg |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2118 "Don't use `? ' at the end of a line. \ |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2119 News agents may remove it" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2120 s (match-beginning 0) e (match-end 0) f t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2121 ;; If interactive is passed down, give them a chance to fix things. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2122 (if (and interact (y-or-n-p (concat msg ". Fix? "))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2123 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2124 (checkdoc-recursive-edit msg) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2125 (setq msg nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2126 (goto-char s) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2127 (beginning-of-line))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2128 ;; Check for, and potentially remove whitespace appearing at the |
20085 | 2129 ;; end of different lines. |
2130 (progn | |
2131 (goto-char start) | |
22195 | 2132 ;; There is no documentation in the Emacs Lisp manual about this check, |
20085 | 2133 ;; it is intended to help clean up messy code and reduce the file size. |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2134 (while (and (not msg) (re-search-forward "[^ \t\n;]\\([ \t]+\\)$" end t)) |
20085 | 2135 ;; This is not a complex activity |
2136 (if (checkdoc-autofix-ask-replace | |
2137 (match-beginning 1) (match-end 1) | |
22195 | 2138 "White space at end of line. Remove? " "") |
20085 | 2139 nil |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2140 (setq msg "White space found at end of line" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2141 s (match-beginning 1) e (match-end 1)))))) |
20085 | 2142 ;; Return an error and leave the cursor at that spot, or restore |
2143 ;; the cursor. | |
2144 (if msg | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2145 (checkdoc-create-error msg s e f) |
20085 | 2146 (goto-char p) |
2147 nil))) | |
2148 | |
2149 ;;; Comment checking engine | |
2150 ;; | |
2151 (eval-when-compile | |
2152 ;; We must load this to: | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2153 ;; a) get symbols for compile and |
20085 | 2154 ;; b) determine if we have lm-history symbol which doesn't always exist |
2155 (require 'lisp-mnt)) | |
2156 | |
2157 (defun checkdoc-file-comments-engine () | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2158 "Return a message list if this file does not match the Emacs standard. |
20085 | 2159 This checks for style only, such as the first line, Commentary:, |
2160 Code:, and others referenced in the style guide." | |
2161 (if (featurep 'lisp-mnt) | |
2162 nil | |
2163 (require 'lisp-mnt) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2164 ;; Old XEmacs don't have `lm-commentary-mark' |
20085 | 2165 (if (and (not (fboundp 'lm-commentary-mark)) (boundp 'lm-commentary)) |
2166 (defalias 'lm-commentary-mark 'lm-commentary))) | |
2167 (save-excursion | |
2168 (let* ((f1 (file-name-nondirectory (buffer-file-name))) | |
2169 (fn (file-name-sans-extension f1)) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2170 (fe (substring f1 (length fn))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2171 (err nil)) |
20085 | 2172 (goto-char (point-min)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2173 ;; This file has been set up where ERR is a variable. Each check is |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2174 ;; asked, and the function will make sure that if the user does not |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2175 ;; auto-fix some error, that we still move on to the next auto-fix, |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2176 ;; AND we remember the past errors. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2177 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2178 err |
20085 | 2179 ;; Lisp Maintenance checks first |
2180 ;; Was: (lm-verify) -> not flexible enough for some people | |
2181 ;; * Summary at the beginning of the file: | |
2182 (if (not (lm-summary)) | |
2183 ;; This certifies as very complex so always ask unless | |
2184 ;; it's set to never | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2185 (if (checkdoc-y-or-n-p "There is no first line summary! Add one? ") |
20085 | 2186 (progn |
2187 (goto-char (point-min)) | |
2188 (insert ";;; " fn fe " --- " (read-string "Summary: ") "\n")) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2189 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2190 "The first line should be of the form: \";;; package --- Summary\"" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2191 (point-min) (save-excursion (goto-char (point-min)) (end-of-line) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2192 (point)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2193 nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2194 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2195 err |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2196 (or |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2197 ;; * Commentary Section |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2198 (if (not (lm-commentary-mark)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2199 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2200 (goto-char (point-min)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2201 (cond |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2202 ((re-search-forward |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2203 "write\\s-+to\\s-+the\\s-+Free Software Foundation, Inc." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2204 nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2205 (re-search-forward "^;;\\s-*\n\\|^\n" nil t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2206 ((or (re-search-forward "^;;; History" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2207 (re-search-forward "^;;; Code" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2208 (re-search-forward "^(require" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2209 (re-search-forward "^(")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2210 (beginning-of-line))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2211 (if (checkdoc-y-or-n-p |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2212 "You should have a \";;; Commentary:\", add one? ") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2213 (insert "\n;;; Commentary:\n;; \n\n") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2214 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2215 "You should have a section marked \";;; Commentary:\"" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2216 nil nil t))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2217 nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2218 err)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2219 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2220 err |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2221 (or |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2222 ;; * History section. Say nothing if there is a file ChangeLog |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2223 (if (or (not checkdoc-force-history-flag) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2224 (file-exists-p "ChangeLog") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2225 (file-exists-p "../ChangeLog") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2226 (let ((fn 'lm-history-mark)) ;bestill byte-compiler |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2227 (and (fboundp fn) (funcall fn)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2228 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2229 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2230 (goto-char (or (lm-commentary-mark) (point-min))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2231 (cond |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2232 ((re-search-forward |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2233 "write\\s-+to\\s-+the\\s-+Free Software Foundation, Inc." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2234 nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2235 (re-search-forward "^;;\\s-*\n\\|^\n" nil t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2236 ((or (re-search-forward "^;;; Code" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2237 (re-search-forward "^(require" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2238 (re-search-forward "^(")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2239 (beginning-of-line))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2240 (if (checkdoc-y-or-n-p |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2241 "You should have a \";;; History:\", add one? ") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2242 (insert "\n;;; History:\n;; \n\n") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2243 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2244 "You should have a section marked \";;; History:\" or use a ChangeLog" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2245 (point) nil)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2246 err)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2247 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2248 err |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2249 (or |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2250 ;; * Code section |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2251 (if (not (lm-code-mark)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2252 (let ((cont t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2253 (goto-char (point-min)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2254 (while (and cont (re-search-forward "^(" nil t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2255 (setq cont (looking-at "require\\s-+"))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2256 (if (and (not cont) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2257 (checkdoc-y-or-n-p |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2258 "There is no ;;; Code: marker. Insert one? ")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2259 (progn (beginning-of-line) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2260 (insert ";;; Code:\n") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2261 nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2262 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2263 "You should have a section marked \";;; Code:\"" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2264 (point) nil))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2265 nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2266 err)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2267 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2268 err |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2269 (or |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2270 ;; * A footer. Not compartmentalized from lm-verify: too bad. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2271 ;; The following is partially clipped from lm-verify |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2272 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2273 (goto-char (point-max)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2274 (if (not (re-search-backward |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2275 (concat "^;;;[ \t]+" fn "\\(" (regexp-quote fe) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2276 "\\)?[ \t]+ends here[ \t]*$" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2277 "\\|^;;;[ \t]+ End of file[ \t]+" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2278 fn "\\(" (regexp-quote fe) "\\)?") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2279 nil t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2280 (if (checkdoc-y-or-n-p "No identifiable footer! Add one? ") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2281 (progn |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2282 (goto-char (point-max)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2283 (insert "\n(provide '" fn ")\n\n;;; " fn fe " ends here\n")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2284 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2285 (format "The footer should be: (provide '%s)\\n;;; %s%s ends here" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2286 fn fn fe) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2287 (1- (point-max)) (point-max))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2288 err)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2289 ;; The below checks will not return errors if the user says NO |
20085 | 2290 |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2291 ;; Let's spellcheck the commentary section. This is the only |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2292 ;; section that is easy to pick out, and it is also the most |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2293 ;; visible section (with the finder). |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2294 (let ((cm (lm-commentary-mark))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2295 (if cm |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2296 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2297 (goto-char (lm-commentary-mark)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2298 ;; Spellcheck between the commentary, and the first |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2299 ;; non-comment line. We could use lm-commentary, but that |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2300 ;; returns a string, and Ispell wants to talk to a buffer. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2301 ;; Since the comments talk about Lisp, use the specialized |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2302 ;; spell-checker we also used for doc strings. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2303 (let ((e (save-excursion (re-search-forward "^[^;]" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2304 (point)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2305 (checkdoc-sentencespace-region-engine (point) e) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2306 (checkdoc-proper-noun-region-engine (point) e) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2307 (checkdoc-ispell-docstring-engine e))))) |
20085 | 2308 ;;; test comment out code |
2309 ;;; (foo 1 3) | |
2310 ;;; (bar 5 7) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2311 (setq |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2312 err |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2313 (or |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2314 ;; Generic Full-file checks (should be comment related) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2315 (checkdoc-run-hooks 'checkdoc-comment-style-hooks) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2316 err)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2317 ;; Done with full file comment checks |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2318 err))) |
20085 | 2319 |
2320 (defun checkdoc-outside-major-sexp () | |
2321 "Return t if point is outside the bounds of a valid sexp." | |
2322 (save-match-data | |
2323 (save-excursion | |
2324 (let ((p (point))) | |
2325 (or (progn (beginning-of-defun) (bobp)) | |
2326 (progn (end-of-defun) (< (point) p))))))) | |
2327 | |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2328 ;;; `error' and `message' text verifier. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2329 ;; |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2330 (defun checkdoc-message-text-search (&optional beg end) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2331 "Search between BEG and END for a style error with message text. |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2332 Optional arguments BEG and END represent the boundary of the check. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2333 The default boundary is the entire buffer." |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2334 (let ((e nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2335 (type nil)) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2336 (if (not (or beg end)) (setq beg (point-min) end (point-max))) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2337 (goto-char beg) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2338 (while (setq type (checkdoc-message-text-next-string end)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2339 (setq e (checkdoc-message-text-engine type))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2340 e)) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2341 |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2342 (defun checkdoc-message-text-next-string (end) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2343 "Move cursor to the next checkable message string after point. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2344 Return the message classification. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2345 Argument END is the maximum bounds to search in." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2346 (let ((return nil)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2347 (while (and (not return) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2348 (re-search-forward |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2349 "(\\s-*\\(\\(\\w\\|\\s_\\)*error\\|\ |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2350 \\(\\w\\|\\s_\\)*y-or-n-p\\(-with-timeout\\)?\ |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2351 \\|checkdoc-autofix-ask-replace\\)[ \t\n]+" end t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2352 (let* ((fn (match-string 1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2353 (type (cond ((string-match "error" fn) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2354 'error) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2355 (t 'y-or-n-p)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2356 (if (string-match "checkdoc-autofix-ask-replace" fn) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2357 (progn (forward-sexp 2) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2358 (skip-chars-forward " \t\n"))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2359 (if (and (eq type 'y-or-n-p) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2360 (looking-at "(format[ \t\n]+")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2361 (goto-char (match-end 0))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2362 (skip-chars-forward " \t\n") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2363 (if (not (looking-at "\"")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2364 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2365 (setq return type)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2366 return)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2367 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2368 (defun checkdoc-message-text-engine (&optional type) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2369 "Return or fix errors found in strings passed to a message display function. |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2370 According to the documentation for the function `error', the error list |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2371 should not end with a period, and should start with a capital letter. |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2372 The function `y-or-n-p' has similar constraints. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2373 Argument TYPE specifies the type of question, such as `error or `y-or-n-p." |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2374 ;; If type is nil, then attempt to derive it. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2375 (if (not type) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2376 (save-excursion |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2377 (up-list -1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2378 (if (looking-at "(format") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2379 (up-list -1)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2380 (setq type |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2381 (cond ((looking-at "(error") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2382 'error) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2383 (t 'y-or-n-p))))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2384 (let ((case-fold-search nil)) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2385 (or |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2386 ;; From the documentation of the symbol `error': |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2387 ;; In Emacs, the convention is that error messages start with a capital |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2388 ;; letter but *do not* end with a period. Please follow this convention |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2389 ;; for the sake of consistency. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2390 (if (and (save-excursion (forward-char 1) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2391 (looking-at "[a-z]\\w+")) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2392 (not (checkdoc-autofix-ask-replace |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2393 (match-beginning 0) (match-end 0) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2394 "Capitalize your message text? " |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2395 (capitalize (match-string 0)) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2396 t))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2397 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2398 "Messages should start with a capital letter" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2399 (match-beginning 0) (match-end 0)) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2400 nil) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2401 ;; In general, sentences should have two spaces after the period. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2402 (checkdoc-sentencespace-region-engine (point) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2403 (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2404 (point))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2405 ;; Look for proper nouns in this region too. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2406 (checkdoc-proper-noun-region-engine (point) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2407 (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2408 (point))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2409 ;; Here are message type specific questions. |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2410 (if (and (eq type 'error) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2411 (save-excursion (forward-sexp 1) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2412 (forward-char -2) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2413 (looking-at "\\.")) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2414 (not (checkdoc-autofix-ask-replace (match-beginning 0) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2415 (match-end 0) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2416 "Remove period from error? " |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2417 "" |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2418 t))) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2419 (checkdoc-create-error |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2420 "Error messages should *not* end with a period" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2421 (match-beginning 0) (match-end 0)) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2422 nil) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2423 ;; `y-or-n-p' documentation explicitly says: |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2424 ;; It should end in a space; `y-or-n-p' adds `(y or n) ' to it. |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2425 ;; I added the ? requirement. Without it, it is unclear that we |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2426 ;; ask a question and it appears to be an undocumented style. |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2427 (if (eq type 'y-or-n-p) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2428 (if (not (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2429 (forward-char -3) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2430 (not (looking-at "\\? ")))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2431 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2432 (if (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2433 (forward-char -2) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2434 (looking-at "\\?")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2435 ;; If we see a ?, then replace with "? ". |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2436 (if (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2437 (match-beginning 0) (match-end 0) |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
2438 "`y-or-n-p' argument should end with \"? \". Fix? " |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2439 "? " t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2440 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2441 (checkdoc-create-error |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
2442 "`y-or-n-p' argument should end with \"? \"" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2443 (match-beginning 0) (match-end 0))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2444 (if (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2445 (forward-char -2) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2446 (looking-at " ")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2447 (if (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2448 (match-beginning 0) (match-end 0) |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
2449 "`y-or-n-p' argument should end with \"? \". Fix? " |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2450 "? " t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2451 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2452 (checkdoc-create-error |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
2453 "`y-or-n-p' argument should end with \"? \"" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2454 (match-beginning 0) (match-end 0))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2455 (if (and ;; if this isn't true, we have a problem. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2456 (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2457 (forward-char -1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2458 (looking-at "\"")) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2459 (checkdoc-autofix-ask-replace |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2460 (match-beginning 0) (match-end 0) |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
2461 "`y-or-n-p' argument should end with \"? \". Fix? " |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2462 "? \"" t)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2463 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2464 (checkdoc-create-error |
26615
1d769c66f407
(checkdoc-this-string-valid-engine):
Richard M. Stallman <rms@gnu.org>
parents:
25697
diff
changeset
|
2465 "`y-or-n-p' argument should end with \"? \"" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2466 (match-beginning 0) (match-end 0))))))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2467 ;; Now, let's just run the spell checker on this guy. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2468 (checkdoc-ispell-docstring-engine (save-excursion (forward-sexp 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2469 (point))) |
22111
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2470 ))) |
38f78542051a
Updated with latest version. Changes include:
Eric M. Ludlam <zappo@gnu.org>
parents:
21651
diff
changeset
|
2471 |
20085 | 2472 ;;; Auto-fix helper functions |
2473 ;; | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2474 (defun checkdoc-y-or-n-p (question) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2475 "Like `y-or-n-p', but pays attention to `checkdoc-autofix-flag'. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2476 Argument QUESTION is the prompt passed to `y-or-n-p'." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2477 (prog1 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2478 (if (or (not checkdoc-autofix-flag) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2479 (eq checkdoc-autofix-flag 'never)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2480 nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2481 (y-or-n-p question)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2482 (if (eq checkdoc-autofix-flag 'automatic-then-never) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2483 (setq checkdoc-autofix-flag 'never)))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2484 |
20085 | 2485 (defun checkdoc-autofix-ask-replace (start end question replacewith |
2486 &optional complex) | |
2487 "Highlight between START and END and queries the user with QUESTION. | |
2488 If the user says yes, or if `checkdoc-autofix-flag' permits, replace | |
2489 the region marked by START and END with REPLACEWITH. If optional flag | |
2490 COMPLEX is non-nil, then we may ask the user a question. See the | |
2491 documentation for `checkdoc-autofix-flag' for details. | |
2492 | |
2493 If a section is auto-replaced without asking the user, this function | |
2494 will pause near the fixed code so the user will briefly see what | |
2495 happened. | |
2496 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2497 This function returns non-nil if the text was replaced. |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2498 |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2499 This function will not modify `match-data'." |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2500 (if (and checkdoc-autofix-flag |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2501 (not (eq checkdoc-autofix-flag 'never))) |
20085 | 2502 (let ((o (checkdoc-make-overlay start end)) |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2503 (ret nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2504 (md (match-data))) |
20085 | 2505 (unwind-protect |
2506 (progn | |
2507 (checkdoc-overlay-put o 'face 'highlight) | |
2508 (if (or (eq checkdoc-autofix-flag 'automatic) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2509 (eq checkdoc-autofix-flag 'automatic-then-never) |
20085 | 2510 (and (eq checkdoc-autofix-flag 'semiautomatic) |
2511 (not complex)) | |
2512 (and (or (eq checkdoc-autofix-flag 'query) complex) | |
2513 (y-or-n-p question))) | |
2514 (save-excursion | |
2515 (goto-char start) | |
2516 ;; On the off chance this is automatic, display | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2517 ;; the question anyway so the user knows what's |
20085 | 2518 ;; going on. |
2519 (if checkdoc-bouncy-flag (message "%s -> done" question)) | |
2520 (delete-region start end) | |
2521 (insert replacewith) | |
2522 (if checkdoc-bouncy-flag (sit-for 0)) | |
2523 (setq ret t))) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2524 (checkdoc-delete-overlay o) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2525 (set-match-data md)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2526 (checkdoc-delete-overlay o) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2527 (set-match-data md)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2528 (if (eq checkdoc-autofix-flag 'automatic-then-never) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2529 (setq checkdoc-autofix-flag 'never)) |
20085 | 2530 ret))) |
2531 | |
2532 ;;; Warning management | |
2533 ;; | |
2534 (defvar checkdoc-output-font-lock-keywords | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2535 '(("\\(\\w+\\.el\\): \\(\\w+\\)" |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2536 (1 font-lock-function-name-face) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2537 (2 font-lock-comment-face)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2538 ("^\\(\\w+\\.el\\):" 1 font-lock-function-name-face) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2539 (":\\([0-9]+\\):" 1 font-lock-constant-face)) |
20085 | 2540 "Keywords used to highlight a checkdoc diagnostic buffer.") |
2541 | |
2542 (defvar checkdoc-output-mode-map nil | |
2543 "Keymap used in `checkdoc-output-mode'.") | |
2544 | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2545 (defvar checkdoc-pending-errors nil |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2546 "Non-nil when there are errors that have not been displayed yet.") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2547 |
20085 | 2548 (if checkdoc-output-mode-map |
2549 nil | |
2550 (setq checkdoc-output-mode-map (make-sparse-keymap)) | |
2551 (if (not (string-match "XEmacs" emacs-version)) | |
2552 (define-key checkdoc-output-mode-map [mouse-2] | |
2553 'checkdoc-find-error-mouse)) | |
2554 (define-key checkdoc-output-mode-map "\C-c\C-c" 'checkdoc-find-error) | |
2555 (define-key checkdoc-output-mode-map "\C-m" 'checkdoc-find-error)) | |
2556 | |
2557 (defun checkdoc-output-mode () | |
2558 "Create and setup the buffer used to maintain checkdoc warnings. | |
2559 \\<checkdoc-output-mode-map>\\[checkdoc-find-error] - Go to this error location | |
2560 \\[checkdoc-find-error-mouse] - Goto the error clicked on." | |
2561 (if (get-buffer checkdoc-diagnostic-buffer) | |
2562 (get-buffer checkdoc-diagnostic-buffer) | |
2563 (save-excursion | |
2564 (set-buffer (get-buffer-create checkdoc-diagnostic-buffer)) | |
2565 (kill-all-local-variables) | |
2566 (setq mode-name "Checkdoc" | |
2567 major-mode 'checkdoc-output-mode) | |
2568 (set (make-local-variable 'font-lock-defaults) | |
2569 '((checkdoc-output-font-lock-keywords) t t ((?- . "w") (?_ . "w")))) | |
2570 (use-local-map checkdoc-output-mode-map) | |
2571 (run-hooks 'checkdoc-output-mode-hook) | |
2572 (current-buffer)))) | |
2573 | |
2574 (defun checkdoc-find-error-mouse (e) | |
2575 ;; checkdoc-params: (e) | |
2576 "Call `checkdoc-find-error' where the user clicks the mouse." | |
2577 (interactive "e") | |
2578 (mouse-set-point e) | |
2579 (checkdoc-find-error)) | |
2580 | |
2581 (defun checkdoc-find-error () | |
2582 "In a checkdoc diagnostic buffer, find the error under point." | |
2583 (interactive) | |
2584 (beginning-of-line) | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2585 (if (looking-at "\\(\\(\\w+\\|\\s_\\)+\\.el\\):\\([0-9]+\\):") |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2586 (let ((l (string-to-int (match-string 3))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2587 (f (match-string 1))) |
20085 | 2588 (if (not (get-buffer f)) |
2589 (error "Can't find buffer %s" f)) | |
2590 (switch-to-buffer-other-window (get-buffer f)) | |
2591 (goto-line l)))) | |
2592 | |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2593 (defun checkdoc-buffer-label () |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2594 "The name to use for a checkdoc buffer in the error list." |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2595 (if (buffer-file-name) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2596 (file-name-nondirectory (buffer-file-name)) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2597 (concat "#<buffer "(buffer-name) ">"))) |
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2598 |
20085 | 2599 (defun checkdoc-start-section (check-type) |
2600 "Initialize the checkdoc diagnostic buffer for a pass. | |
2601 Create the header so that the string CHECK-TYPE is displayed as the | |
2602 function called to create the messages." | |
2603 (checkdoc-output-to-error-buffer | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2604 "\n\n\C-l\n*** " |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2605 (checkdoc-buffer-label) ": " check-type " V " checkdoc-version)) |
20085 | 2606 |
2607 (defun checkdoc-error (point msg) | |
2608 "Store POINT and MSG as errors in the checkdoc diagnostic buffer." | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2609 (setq checkdoc-pending-errors t) |
20085 | 2610 (checkdoc-output-to-error-buffer |
23192
1ea9db09a678
(checkdoc-buffer-label): New function.
Eric M. Ludlam <zappo@gnu.org>
parents:
22674
diff
changeset
|
2611 "\n" (checkdoc-buffer-label) ":" |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2612 (int-to-string (count-lines (point-min) (or point 1))) ": " |
20085 | 2613 msg)) |
2614 | |
2615 (defun checkdoc-output-to-error-buffer (&rest text) | |
2616 "Place TEXT into the checkdoc diagnostic buffer." | |
2617 (save-excursion | |
2618 (set-buffer (checkdoc-output-mode)) | |
2619 (goto-char (point-max)) | |
2620 (apply 'insert text))) | |
2621 | |
2622 (defun checkdoc-show-diagnostics () | |
2623 "Display the checkdoc diagnostic buffer in a temporary window." | |
22674
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2624 (if checkdoc-pending-errors |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2625 (let ((b (get-buffer checkdoc-diagnostic-buffer))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2626 (if b (progn (pop-to-buffer b) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2627 (goto-char (point-max)) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2628 (re-search-backward "\C-l" nil t) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2629 (beginning-of-line) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2630 (forward-line 1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2631 (recenter 0))) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2632 (other-window -1) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2633 (setq checkdoc-pending-errors nil) |
f72e7540940a
(checkdoc): Updated commentary.
Eric M. Ludlam <zappo@gnu.org>
parents:
22579
diff
changeset
|
2634 nil))) |
20085 | 2635 |
2636 (defgroup checkdoc nil | |
22195 | 2637 "Support for doc string checking in Emacs Lisp." |
20085 | 2638 :prefix "checkdoc" |
21651
86fcccceba7b
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21181
diff
changeset
|
2639 :group 'lisp |
86fcccceba7b
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21181
diff
changeset
|
2640 :version "20.3") |
20085 | 2641 |
2642 (custom-add-option 'emacs-lisp-mode-hook | |
2643 (lambda () (checkdoc-minor-mode 1))) | |
2644 | |
33495
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
2645 (add-to-list 'debug-ignored-errors |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
2646 "Argument `.*' should appear (as .*) in the doc string") |
07c7cb89c236
(checkdoc-minor-mode) <defvar>: Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27444
diff
changeset
|
2647 |
20085 | 2648 (provide 'checkdoc) |
22195 | 2649 |
20085 | 2650 ;;; checkdoc.el ends here |