[Emacs-diffs] /srv/bzr/emacs/trunk r112119: * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make

[Dmitry Gutov]

------------------------------------------------------------
revno: 112119
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-24 02:04:40 +0400
message:
  * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make
  it safe-local.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-23 17:43:18 +0000
+++ b/lisp/ChangeLog    2013-03-23 22:04:40 +0000
@@ -1,5 +1,8 @@
 2013-03-23  Dmitry Gutov  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-02-17 16:58:12 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-03-23 22:04:40 +0000
@@ -1436,6 +1436,8 @@
   :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.