aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a767eab06f4..26a5131feaa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-07-11 Leo <sdl.web@gmail.com> (tiny change)
2
3 * files.el (toggle-read-only): Only do the `C-x C-q' warning on VC
4 backends where it makes sense (bug#2623).
5
12011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-07-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * dired-x.el (dired-guess-default): Remove duplicate shell command 8 * dired-x.el (dired-guess-default): Remove duplicate shell command
diff --git a/lisp/files.el b/lisp/files.el
index c9f85ff6a1a..1071adb6967 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4694,7 +4694,7 @@ and `view-read-only' is non-nil, enter view mode."
4694 (view-mode-enter)) 4694 (view-mode-enter))
4695 (t (setq buffer-read-only (not buffer-read-only)) 4695 (t (setq buffer-read-only (not buffer-read-only))
4696 (force-mode-line-update))) 4696 (force-mode-line-update)))
4697 (if (vc-backend buffer-file-name) 4697 (if (memq (vc-backend buffer-file-name) '(RCS SCCS))
4698 (message "%s" (substitute-command-keys 4698 (message "%s" (substitute-command-keys
4699 (concat "File is under version-control; " 4699 (concat "File is under version-control; "
4700 "use \\[vc-next-action] to check in/out")))))) 4700 "use \\[vc-next-action] to check in/out"))))))