Mercurial > emacs
comparison lisp/dired.el @ 90650:02cf29720f31
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 07 Nov 2006 23:22:48 +0000 |
parents | bb0e318b7c53 5fbb36eba879 |
children | f1d13e615070 |
comparison
equal
deleted
inserted
replaced
90649:d53934e7ddef | 90650:02cf29720f31 |
---|---|
789 ;; based on dired-directory, e.g. with ange-ftp to a SysV host | 789 ;; based on dired-directory, e.g. with ange-ftp to a SysV host |
790 ;; where ls won't understand -Al switches. | 790 ;; where ls won't understand -Al switches. |
791 (run-hooks 'dired-before-readin-hook) | 791 (run-hooks 'dired-before-readin-hook) |
792 (if (consp buffer-undo-list) | 792 (if (consp buffer-undo-list) |
793 (setq buffer-undo-list nil)) | 793 (setq buffer-undo-list nil)) |
794 (make-local-variable 'file-name-coding-system) | |
795 (setq file-name-coding-system | |
796 (or coding-system-for-read file-name-coding-system)) | |
794 (let (buffer-read-only | 797 (let (buffer-read-only |
795 ;; Don't make undo entries for readin. | 798 ;; Don't make undo entries for readin. |
796 (buffer-undo-list t)) | 799 (buffer-undo-list t)) |
797 (widen) | 800 (widen) |
798 (erase-buffer) | 801 (erase-buffer) |