comparison lisp/efs/dired.el @ 181:bfd6434d15b3 r20-3b17

Import from CVS: tag r20-3b17
author cvs
date Mon, 13 Aug 2007 09:53:19 +0200
parents 9ad43877534d
children e121b013d1f0
comparison
equal deleted inserted replaced
180:add28d59e586 181:bfd6434d15b3
2951 (bol (save-excursion (skip-chars-backward "^\r\n") (point))) 2951 (bol (save-excursion (skip-chars-backward "^\r\n") (point)))
2952 case-fold-search file p1 p2) 2952 case-fold-search file p1 p2)
2953 (save-excursion 2953 (save-excursion
2954 (and 2954 (and
2955 (setq p1 (dired-move-to-filename (not no-error-if-not-filep) bol eol)) 2955 (setq p1 (dired-move-to-filename (not no-error-if-not-filep) bol eol))
2956 (setq p2 (dired-move-to-end-of-filename no-error-if-not-filep bol eol)) 2956 (setq p2 (if (eq system-type 'windows-nt) ; ignore carriage-return at eol
2957 ;; We seem to be picking up the carriage-return at the end of the 2957 (1- (dired-move-to-end-of-filename no-error-if-not-filep bol eol))
2958 ;; line, so here's a quick fix to get dired working. 2958 (dired-move-to-end-of-filename no-error-if-not-filep bol eol)))
2959 (if (eq system-type 'windows-nt)
2960 (setq p2 (1- p2)))
2961 (setq file (buffer-substring p1 p2)) 2959 (setq file (buffer-substring p1 p2))
2962 ;; Check if ls quoted the names, and unquote them. 2960 ;; Check if ls quoted the names, and unquote them.
2963 ;; Using read to unquote is much faster than substituting 2961 ;; Using read to unquote is much faster than substituting
2964 ;; \007 (4 chars) -> ^G (1 char) etc. in a lisp loop. 2962 ;; \007 (4 chars) -> ^G (1 char) etc. in a lisp loop.
2965 (cond ((memq ?b dired-internal-switches) ; System V ls 2963 (cond ((memq ?b dired-internal-switches) ; System V ls