diff options
| author | Miles Bader | 2008-01-30 07:57:28 +0000 |
|---|---|---|
| committer | Miles Bader | 2008-01-30 07:57:28 +0000 |
| commit | d235ca2ff8fab139ce797757fcb159d1e28fa7e0 (patch) | |
| tree | 96c5cd1a06a0d9dc26e8470c6eabfc032c0046f3 /lisp/arc-mode.el | |
| parent | 3709a060f679dba14df71ae64a0035fa2b5b3106 (diff) | |
| parent | 02cbe062bee38a6705bafb1699d77e3c44cfafcf (diff) | |
| download | emacs-d235ca2ff8fab139ce797757fcb159d1e28fa7e0.tar.gz emacs-d235ca2ff8fab139ce797757fcb159d1e28fa7e0.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
Diffstat (limited to 'lisp/arc-mode.el')
| -rw-r--r-- | lisp/arc-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 2b417b06398..3e5cef9fec9 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -1019,7 +1019,8 @@ using `make-temp-file', and the generated name is returned." | |||
| 1019 | (archive-maybe-update t)) | 1019 | (archive-maybe-update t)) |
| 1020 | (or (not (buffer-name buffer)) | 1020 | (or (not (buffer-name buffer)) |
| 1021 | (cond | 1021 | (cond |
| 1022 | (view-p (view-buffer buffer (and just-created 'kill-buffer))) | 1022 | (view-p (view-buffer |
| 1023 | buffer (and just-created 'kill-buffer-if-not-modified))) | ||
| 1023 | ((eq other-window-p 'display) (display-buffer buffer)) | 1024 | ((eq other-window-p 'display) (display-buffer buffer)) |
| 1024 | (other-window-p (switch-to-buffer-other-window buffer)) | 1025 | (other-window-p (switch-to-buffer-other-window buffer)) |
| 1025 | (t (switch-to-buffer buffer)))))) | 1026 | (t (switch-to-buffer buffer)))))) |
| @@ -1968,7 +1969,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." | |||
| 1968 | (archive-rar-extract tmpfile name)) | 1969 | (archive-rar-extract tmpfile name)) |
| 1969 | (if tmpbuf (kill-buffer tmpbuf)) | 1970 | (if tmpbuf (kill-buffer tmpbuf)) |
| 1970 | (delete-file tmpfile)))) | 1971 | (delete-file tmpfile)))) |
| 1971 | 1972 | ||
| 1972 | 1973 | ||
| 1973 | ;; ------------------------------------------------------------------------- | 1974 | ;; ------------------------------------------------------------------------- |
| 1974 | ;; This line was a mistake; it is kept now for compatibility. | 1975 | ;; This line was a mistake; it is kept now for compatibility. |