diff options
| author | Glenn Morris | 2014-08-28 15:18:24 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-08-28 15:18:24 -0400 |
| commit | 6539a7e2a29d4f3e914e9bccd3f842c0641f815b (patch) | |
| tree | f7e9d87898791a730a678aa833b0e53f933d9fe7 | |
| parent | 74910c5d074b4173bd0469ca4e315e9deac78718 (diff) | |
| download | emacs-6539a7e2a29d4f3e914e9bccd3f842c0641f815b.tar.gz emacs-6539a7e2a29d4f3e914e9bccd3f842c0641f815b.zip | |
* lisp/tar-mode.el (tar--extract, tar-extract): Avoid disabling undo
in extracted buffers.
Fixes: debbugs:18344
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/tar-mode.el | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 00bb37a1714..81e9a0f2280 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-08-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * tar-mode.el (tar--extract, tar-extract): | ||
| 4 | Avoid permanently disabling undo in extracted buffers. (Bug#18344) | ||
| 5 | |||
| 1 | 2014-08-27 Michael Albinus <michael.albinus@gmx.de> | 6 | 2014-08-27 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * emacs-lisp/authors.el (authors-aliases): Addition. | 8 | * emacs-lisp/authors.el (authors-aliases): Addition. |
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 66118d3e288..129314cbcee 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el | |||
| @@ -800,8 +800,6 @@ tar-file's buffer." | |||
| 800 | tarname | 800 | tarname |
| 801 | ")")) | 801 | ")")) |
| 802 | (buffer (generate-new-buffer bufname))) | 802 | (buffer (generate-new-buffer bufname))) |
| 803 | (with-current-buffer buffer | ||
| 804 | (setq buffer-undo-list t)) | ||
| 805 | (with-current-buffer tar-data-buffer | 803 | (with-current-buffer tar-data-buffer |
| 806 | (let (coding) | 804 | (let (coding) |
| 807 | (narrow-to-region start end) | 805 | (narrow-to-region start end) |
| @@ -829,7 +827,11 @@ tar-file's buffer." | |||
| 829 | (with-current-buffer buffer | 827 | (with-current-buffer buffer |
| 830 | (set-buffer-multibyte nil))) | 828 | (set-buffer-multibyte nil))) |
| 831 | (widen) | 829 | (widen) |
| 832 | (decode-coding-region start end coding buffer))) | 830 | (with-current-buffer buffer |
| 831 | (setq buffer-undo-list t)) | ||
| 832 | (decode-coding-region start end coding buffer) | ||
| 833 | (with-current-buffer buffer | ||
| 834 | (setq buffer-undo-list nil)))) | ||
| 833 | buffer)) | 835 | buffer)) |
| 834 | 836 | ||
| 835 | (defun tar-extract (&optional other-window-p) | 837 | (defun tar-extract (&optional other-window-p) |
| @@ -869,7 +871,6 @@ tar-file's buffer." | |||
| 869 | (with-current-buffer tar-buffer | 871 | (with-current-buffer tar-buffer |
| 870 | default-directory)) | 872 | default-directory)) |
| 871 | (set-buffer-modified-p nil) | 873 | (set-buffer-modified-p nil) |
| 872 | (setq buffer-undo-list t) | ||
| 873 | (normal-mode) ; pick a mode. | 874 | (normal-mode) ; pick a mode. |
| 874 | (set (make-local-variable 'tar-superior-buffer) tar-buffer) | 875 | (set (make-local-variable 'tar-superior-buffer) tar-buffer) |
| 875 | (set (make-local-variable 'tar-superior-descriptor) descriptor) | 876 | (set (make-local-variable 'tar-superior-descriptor) descriptor) |