From: Lars Ingebrigtsen Date: Sun, 9 Feb 2014 02:44:25 +0000 (-0800) Subject: * files.el (find-file-noselect): Clarify prompt when changing readedness. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~81 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e108fe61dc95eb6ce647366a104b098ec5053c5;p=emacs.git * files.el (find-file-noselect): Clarify prompt when changing readedness. Fixes: debbugs:13261 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3f730aba5e2..205cfa319cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * files.el (find-file-noselect): Clarify prompt when changing + readedness (bug#13261). + * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things (bug#16331). diff --git a/lisp/files.el b/lisp/files.el index 3697467b3bd..38113bc6388 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1910,10 +1910,12 @@ the various files." (eq read-only buffer-file-read-only) (eq read-only buffer-read-only)) (when (or nowarn - (let ((question - (format "File %s is %s on disk. Change buffer mode? " - buffer-file-name - (if read-only "read-only" "writable")))) + (let* ((new-status + (if read-only "read-only" "writable")) + (question + (format "File %s is %s on disk. Make buffer %s, too? " + buffer-file-name + new-status new-status))) (y-or-n-p question))) (setq buffer-read-only read-only))) (setq buffer-file-read-only read-only))