[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110965: vc-hooks.el workaround for bug#11490

[Glenn Morris]

------------------------------------------------------------
revno: 110965
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-26 18:50:12 -0500
message:
  vc-hooks.el workaround for bug#11490
  
  * vc/vc-hooks.el (vc-mistrust-permissions): Default to t, to avoid data-loss.
modified:
  lisp/ChangeLog
  lisp/vc/vc-hooks.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-26 23:31:06 +0000
+++ b/lisp/ChangeLog    2012-11-26 23:50:12 +0000
@@ -1,15 +1,16 @@
-2012-11-26  Fabián Ezequiel Gallina  <address@hidden>
-
-       * progmodes/python.el:
-       (python-indent-guess-indent-offset): If indentation is guessed
-       make python-indent-offset variable buffer local.
-
-2012-11-26  Fabián Ezequiel Gallina  <address@hidden>
+2012-11-26  Glenn Morris  <address@hidden>
+
+       * vc/vc-hooks.el (vc-mistrust-permissions):
+       Default to t, to avoid data-loss.  (Bug#11490)
+
+2012-11-26  Fabián Ezequiel Gallina  <address@hidden>
+
+       * 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  <address@hidden>

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2012-10-29 11:12:17 +0000
+++ b/lisp/vc/vc-hooks.el       2012-11-26 23:50:12 +0000
@@ -107,10 +107,12 @@
   :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)