2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d353fdf7832..bb8c9a53259 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-08  Kevin Ryde  <user42@zip.com.au>
+
+        * emacs-lisp/checkdoc.el (checkdoc-proper-noun-regexp): Match noun
+        at end of sentence (my Bug#4818).
+
 2009-11-08  Jared Finder  <jfinder@crypticstudios.com>
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 6b226be0b28..7140c997283 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -331,12 +331,15 @@ This should be set in an Emacs Lisp file's local variables."
   "List of words (not capitalized) which should be capitalized.")
 
 (defvar checkdoc-proper-noun-regexp
+  ;; "[.!?]" is for noun at end of a sentence, since those chars
+  ;; are symbol syntax in emacs-lisp-mode and so don't match \\_>.
+  ;; The \" allows it to be the last sentence in a docstring too.
   (let ((expr "\\_<\\(")
         (l checkdoc-proper-noun-list))
     (while l
       (setq expr (concat expr (car l) (if (cdr l) "\\|" ""))
             l (cdr l)))
-    (concat expr "\\)\\_>"))
+    (concat expr "\\)\\(\\_>\\|[.!?][ \t\n\"]\\)"))
   "Regular expression derived from `checkdoc-proper-noun-regexp'.")
 
 (defvar checkdoc-common-verbs-regexp nil