Mercurial > emacs
comparison lisp/arc-mode.el @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | a5812696f7bf f3c65e2e68b3 |
children | 858cb33ae39d |
comparison
equal
deleted
inserted
replaced
90427:ddb25860d044 | 90428:a8190f7e546e |
---|---|
896 ;; DOS/Windows systems which preserves the coding-system | 896 ;; DOS/Windows systems which preserves the coding-system |
897 ;; of existing files. We want it to act here as if the | 897 ;; of existing files. We want it to act here as if the |
898 ;; extracted file existed. | 898 ;; extracted file existed. |
899 (let ((file-name-handler-alist | 899 (let ((file-name-handler-alist |
900 '(("" . archive-file-name-handler)))) | 900 '(("" . archive-file-name-handler)))) |
901 (car (find-operation-coding-system 'insert-file-contents | 901 (car (find-operation-coding-system |
902 filename t)))))) | 902 'insert-file-contents |
903 (cons filename (current-buffer)) t)))))) | |
903 (if (and (not coding-system-for-read) | 904 (if (and (not coding-system-for-read) |
904 (not enable-multibyte-characters)) | 905 (not enable-multibyte-characters)) |
905 (setq coding | 906 (setq coding |
906 (coding-system-change-text-conversion coding 'raw-text))) | 907 (coding-system-change-text-conversion coding 'raw-text))) |
907 (if (and coding | 908 (if (and coding |