* lisp/vc/log-edit.el (log-edit-font-lock-gnu-style): Mark safe if boolean.

Do not merge to trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7293a4626ffc1ef46f28ae668961d1f234aa3d20..d205e36a749b17173c96fe88eea5f4a48b9ef5da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,10 @@
 
        * Version 24.2 released.
 
+2012-08-15  Glenn Morris  <rgm@gnu.org>
+
+       * vc/log-edit.el (log-edit-font-lock-gnu-style): Mark safe if boolean.
+
 2012-08-15  Leo Liu  <sdl.web@gmail.com>
 
        * net/rcirc.el (rcirc-split-message): Fix for buffer-local

diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 54d548c09dafcb59518276afc1b5852a7ec0d9f1..4ef2732382ee9e5546d226601146cd81861db494 100644 (file)
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -360,6 +360,12 @@ automatically."
              'log-edit-header)
          nil lax)))))
 
+;; Used in Emacs 24.3+, and in Emacs's .dir-locals.el file.
+;; This is a convenience setting so that people committing files
+;; to Emacs trunk with Emacs 24point2 do not always get queried
+;; about this variable being potentially unsafe.
+(put 'log-edit-font-lock-gnu-style 'safe-local-variable 'booleanp)
+
 ;;;###autoload
 (defun log-edit (callback &optional setup params buffer mode &rest _ignore)
   "Setup a buffer to enter a log message.