diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
| commit | 9f2f14a0725211b13a744573344636b57b9c98b9 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/emacs-lisp/checkdoc.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.bz2 emacs-9f2f14a0725211b13a744573344636b57b9c98b9.zip | |
Merge emacs-25 into master (using imerge)
Diffstat (limited to 'lisp/emacs-lisp/checkdoc.el')
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index bf1a21acaf1..88d5f323f86 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -270,6 +270,7 @@ made in the style guide relating to order." (defcustom checkdoc-package-keywords-flag nil "Non-nil means warn if this file's package keywords are not recognized. Currently, all recognized keywords must be on `finder-known-keywords'." + :version "25.1" :type 'boolean) (define-obsolete-variable-alias 'checkdoc-style-hooks |