* lisp/emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make

it safe-local.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 731705b2aa9dda5dd434c43239f8a5a3050c0925..c1124f51a8e1c5d5333f336f41e20af4cb19bf4a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-03-23  Dmitry Gutov  <dgutov@yandex.ru>
 
+       * emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make
+       it safe-local.
+
        * vc/diff-mode.el (diff-mode-shared-map): Unbind "/" (Bug#14034).
 
 2013-03-23  Leo Liu  <sdl.web@gmail.com>

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 4ebaa0a49d51cfa7d5d862ec8f0b8f8e6fec7aec..b528dd113166ecb54d46fde4ed60c1ec53d1e5cb 100644 (file)
--- 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.