From: Dmitry Gutov Date: Sat, 23 Mar 2013 22:04:40 +0000 (+0400) Subject: * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~108 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bde73d272008310f7d84575088bb94c034c6b7a7;p=emacs.git * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make it safe-local. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 731705b2aa9..c1124f51a8e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-03-23 Dmitry Gutov + * 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 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.