summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@gnu.org>2013-04-05 23:17:55 +0900
committerKenichi Handa <handa@gnu.org>2013-04-05 23:17:55 +0900
commitb7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f (patch)
treef32c8cce416e346d2953f063a0f22e95382cf57e /lisp/emacs-lisp/lisp-mode.el
parent251e91474c91e16b101502c2ed7c05fc13e4ecea (diff)
parent73931ad14ad7a51d91f10b19ae9ca8cadb256916 (diff)
downloademacs-b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f.tar.gz
emacs-b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f.tar.bz2
emacs-b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f.zip
merge trunk
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 4ebaa0a49d5..b528dd11316 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1436,6 +1436,8 @@ Any non-integer value means do not use a different value of
:type '(choice (integer)
(const :tag "Use the current `fill-column'" t))
:group 'lisp)
+(put 'emacs-lisp-docstring-fill-column 'safe-local-variable
+ (lambda (x) (or (eq x t) (integerp x))))
(defun lisp-fill-paragraph (&optional justify)
"Like \\[fill-paragraph], but handle Emacs Lisp comments and docstrings.