diff options
| author | Glenn Morris | 2012-11-26 18:50:12 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-11-26 18:50:12 -0500 |
| commit | 999e745ef7ada0fcecd687fb7595e794577fa6ec (patch) | |
| tree | 47b402a5b6f0936f3a0def4efe1e8010ad096252 | |
| parent | 98f99594f7de9e6c1fd120059ed009ccf1223b50 (diff) | |
| download | emacs-999e745ef7ada0fcecd687fb7595e794577fa6ec.tar.gz emacs-999e745ef7ada0fcecd687fb7595e794577fa6ec.zip | |
vc-hooks.el workaround for bug#11490
* vc/vc-hooks.el (vc-mistrust-permissions): Default to t, to avoid data-loss.
| -rw-r--r-- | lisp/ChangeLog | 15 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-11-26 Fabián Ezequiel Gallina <fgallina@cuca> | 1 | 2012-11-26 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * progmodes/python.el: | 3 | * vc/vc-hooks.el (vc-mistrust-permissions): |
| 4 | (python-indent-guess-indent-offset): If indentation is guessed | 4 | Default to t, to avoid data-loss. (Bug#11490) |
| 5 | make python-indent-offset variable buffer local. | ||
| 6 | 5 | ||
| 7 | 2012-11-26 Fabián Ezequiel Gallina <fgallina@cuca> | 6 | 2012-11-26 Fabián Ezequiel Gallina <fgallina@cuca> |
| 8 | 7 | ||
| 8 | * progmodes/python.el (python-indent-guess-indent-offset): | ||
| 9 | If indentation is guessed make python-indent-offset buffer-local. | ||
| 10 | |||
| 9 | Fix Imenu regression. | 11 | Fix Imenu regression. |
| 10 | * progmodes/python.el: | 12 | * progmodes/python.el (python-nav-beginning-of-defun): |
| 11 | (python-nav-beginning-of-defun): Fix forward movement when | 13 | Fix forward movement when statement(s) separates point from defun. |
| 12 | statement(s) separates point from defun. | ||
| 13 | (python-imenu-prev-index-position): New function. | 14 | (python-imenu-prev-index-position): New function. |
| 14 | 15 | ||
| 15 | 2012-11-26 Eli Zaretskii <eliz@gnu.org> | 16 | 2012-11-26 Eli Zaretskii <eliz@gnu.org> |
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." | |||
| 107 | :type 'boolean | 107 | :type 'boolean |
| 108 | :group 'vc) | 108 | :group 'vc) |
| 109 | 109 | ||
| 110 | (defcustom vc-mistrust-permissions nil | 110 | ;; If you fix bug#11490, probably you can set this back to nil. |
| 111 | (defcustom vc-mistrust-permissions t | ||
| 111 | "If non-nil, don't assume permissions/ownership track version-control status. | 112 | "If non-nil, don't assume permissions/ownership track version-control status. |
| 112 | If nil, do rely on the permissions. | 113 | If nil, do rely on the permissions. |
| 113 | See also variable `vc-consult-headers'." | 114 | See also variable `vc-consult-headers'." |
| 115 | :version "24.3" ; nil->t, bug#11490 | ||
| 114 | :type 'boolean | 116 | :type 'boolean |
| 115 | :group 'vc) | 117 | :group 'vc) |
| 116 | 118 | ||