diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7293a4626ff..d205e36a749 100644
--- 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 54d548c09da..4ef2732382e 100644
--- 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.