From bde73d272008310f7d84575088bb94c034c6b7a7 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 24 Mar 2013 02:04:40 +0400 Subject: [PATCH] * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-docstring-fill-column): Make it safe-local. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/lisp-mode.el | 2 ++ 2 files changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 731705b2aa..c1124f51a8 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 4ebaa0a49d..b528dd1131 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. -- 2.20.1