diff options
| author | Glenn Morris | 2011-03-07 00:39:43 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-03-07 00:39:43 -0800 |
| commit | 619f4b625e020c27d787e14e4f3c499be6b2ef77 (patch) | |
| tree | be046de848df64902af7b2fe79807bbfbd4f8150 | |
| parent | e63e9234d012ed8ac10e32d3b2a0e1539b5685d0 (diff) | |
| download | emacs-619f4b625e020c27d787e14e4f3c499be6b2ef77.tar.gz emacs-619f4b625e020c27d787e14e4f3c499be6b2ef77.zip | |
* lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8559182c5d..effb2a3038a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-03-07 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. | ||
| 4 | |||
| 1 | 2011-03-07 Ed Reingold <reingold@emr.cs.iit.edu> | 5 | 2011-03-07 Ed Reingold <reingold@emr.cs.iit.edu> |
| 2 | 6 | ||
| 3 | * calendar/cal-hebrew.el (diary-hebrew-yahrzeit): | 7 | * calendar/cal-hebrew.el (diary-hebrew-yahrzeit): |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 200291bd925..2fb397ed6f8 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -1115,7 +1115,7 @@ merge in the changes into your working copy." | |||
| 1115 | (dolist (file files) | 1115 | (dolist (file files) |
| 1116 | (unless (file-writable-p file) | 1116 | (unless (file-writable-p file) |
| 1117 | ;; Make the file+buffer read-write. | 1117 | ;; Make the file+buffer read-write. |
| 1118 | (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file)) | 1118 | (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) |
| 1119 | (error "Aborted")) | 1119 | (error "Aborted")) |
| 1120 | (set-file-modes file (logior (file-modes file) 128)) | 1120 | (set-file-modes file (logior (file-modes file) 128)) |
| 1121 | (let ((visited (get-file-buffer file))) | 1121 | (let ((visited (get-file-buffer file))) |