diff options
| author | Lars Ingebrigtsen | 2014-02-08 18:44:25 -0800 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2014-02-08 18:44:25 -0800 |
| commit | 9e108fe61dc95eb6ce647366a104b098ec5053c5 (patch) | |
| tree | 6fd12b99ea37f3078bd4f66a1faeda88178c5a82 | |
| parent | 20dda9306673d4c96665fcca5dc286dbd987c8d6 (diff) | |
| download | emacs-9e108fe61dc95eb6ce647366a104b098ec5053c5.tar.gz emacs-9e108fe61dc95eb6ce647366a104b098ec5053c5.zip | |
* files.el (find-file-noselect): Clarify prompt when changing readedness.
Fixes: debbugs:13261
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/files.el | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3f730aba5e2..205cfa319cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-02-09 Lars Ingebrigtsen <larsi@gnus.org> | 1 | 2014-02-09 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * files.el (find-file-noselect): Clarify prompt when changing | ||
| 4 | readedness (bug#13261). | ||
| 5 | |||
| 3 | * dired.el (dired-internal-do-deletions): Don't say "Deleting..." | 6 | * dired.el (dired-internal-do-deletions): Don't say "Deleting..." |
| 4 | before we actually start to delete things (bug#16331). | 7 | before we actually start to delete things (bug#16331). |
| 5 | 8 | ||
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." | |||
| 1910 | (eq read-only buffer-file-read-only) | 1910 | (eq read-only buffer-file-read-only) |
| 1911 | (eq read-only buffer-read-only)) | 1911 | (eq read-only buffer-read-only)) |
| 1912 | (when (or nowarn | 1912 | (when (or nowarn |
| 1913 | (let ((question | 1913 | (let* ((new-status |
| 1914 | (format "File %s is %s on disk. Change buffer mode? " | 1914 | (if read-only "read-only" "writable")) |
| 1915 | buffer-file-name | 1915 | (question |
| 1916 | (if read-only "read-only" "writable")))) | 1916 | (format "File %s is %s on disk. Make buffer %s, too? " |
| 1917 | buffer-file-name | ||
| 1918 | new-status new-status))) | ||
| 1917 | (y-or-n-p question))) | 1919 | (y-or-n-p question))) |
| 1918 | (setq buffer-read-only read-only))) | 1920 | (setq buffer-read-only read-only))) |
| 1919 | (setq buffer-file-read-only read-only)) | 1921 | (setq buffer-file-read-only read-only)) |