diff options
| author | Christopher Schmidt <christopher@ch.ristopher.com> | 2012-04-18 14:24:13 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-18 14:24:13 +0800 |
| commit | c09c46b263a4c47806775c57bea391612cad4404 (patch) | |
| tree | cb126b90cec1002c7c9556113232fc768173ea9d /lisp | |
| parent | 5f6530ea79767d596c1950a94d63415475e5b1df (diff) | |
| download | emacs-c09c46b263a4c47806775c57bea391612cad4404.tar.gz | |
Fix require-final-newline interaction with read-only buffers.
* lisp/files.el (after-find-file): Do not try to add a final newline
if the buffer is read-only.
Fixes: debbugs:11156
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75b1c7799c4..eff89ba08c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-04-18 Christopher Schmidt <christopher@ch.ristopher.com> + + * files.el (after-find-file): Do not try to add a final newline if + the buffer is read-only (Bug#11156). + 2012-04-17 Richard Stallman <rms@gnu.org> * mail/rmail.el (rmail-start-mail): @@ -9,7 +14,7 @@ (rmail-forward): Pass the Rmail buffer, not nil, for replybuffer. * mail/sendmail.el (mail-bury): Choose the first rmail-mode - buffer, not the last. Reject temp buffers. Use the rmail-mode + buffer, not the last. Reject temp buffers. Use the rmail-mode buffer, not newbuf. 2012-04-17 Juanma Barranquero <lekktu@gmail.com> diff --git a/lisp/files.el b/lisp/files.el index fb4662e7ea8..d757e1a277c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2152,6 +2152,7 @@ unless NOMODES is non-nil." (/= (char-after (1- (point-max))) ?\n) (not (and (eq selective-display t) (= (char-after (1- (point-max))) ?\r))) + (not buffer-read-only) (save-excursion (goto-char (point-max)) (insert "\n"))) |