From 999e745ef7ada0fcecd687fb7595e794577fa6ec Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 26 Nov 2012 18:50:12 -0500 Subject: [PATCH] vc-hooks.el workaround for bug#11490 * vc/vc-hooks.el (vc-mistrust-permissions): Default to t, to avoid data-loss. --- lisp/ChangeLog | 15 ++++++++------- lisp/vc/vc-hooks.el | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 13a1bdc0b38..d0c29dab0d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,15 +1,16 @@ -2012-11-26 Fabián Ezequiel Gallina +2012-11-26 Glenn Morris - * progmodes/python.el: - (python-indent-guess-indent-offset): If indentation is guessed - make python-indent-offset variable buffer local. + * vc/vc-hooks.el (vc-mistrust-permissions): + Default to t, to avoid data-loss. (Bug#11490) 2012-11-26 Fabián Ezequiel Gallina + * 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 diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 07a292ae435..ef900cb5257 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -107,10 +107,12 @@ control systems." :type 'boolean :group 'vc) -(defcustom vc-mistrust-permissions nil +;; If you fix bug#11490, probably you can set this back to nil. +(defcustom vc-mistrust-permissions t "If non-nil, don't assume permissions/ownership track version-control status. If nil, do rely on the permissions. See also variable `vc-consult-headers'." + :version "24.3" ; nil->t, bug#11490 :type 'boolean :group 'vc) -- 2.11.4.GIT