X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/207cb73c182d432a00fef797428d3b79ab519287..999e745ef7ada0fcecd687fb7595e794577fa6ec:/lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5ce3fcd0b..d0c29dab0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,16 @@
+2012-11-26  Glenn Morris  <rgm@gnu.org>
+
+	* vc/vc-hooks.el (vc-mistrust-permissions):
+	Default to t, to avoid data-loss.  (Bug#11490)
+
 2012-11-26  Fabián Ezequiel Gallina  <fgallina@cuca>
 
+	* progmodes/python.el (python-indent-guess-indent-offset):
+	If indentation is guessed make python-indent-offset buffer-local.
+
 	Fix Imenu regression.
-	* progmodes/python.el:
-	(python-nav-beginning-of-defun): Fix forward movement when
-	statement(s) separates point from defun.
+	* progmodes/python.el (python-nav-beginning-of-defun):
+	Fix forward movement when statement(s) separates point from defun.
 	(python-imenu-prev-index-position): New function.
 
 2012-11-26  Eli Zaretskii  <eliz@gnu.org>