Mercurial > emacs
comparison lisp/dired.el @ 8403:941432da0ff3
(dired-noselect): Call abbreviate-file-name here.
(dired-internal-noselect): Not here.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 31 Jul 1994 21:42:11 +0000 |
parents | ee7b758d2efa |
children | fed86303cb07 |
comparison
equal
deleted
inserted
replaced
8402:f1a7929cee65 | 8403:941432da0ff3 |
---|---|
363 ;; some shells make: | 363 ;; some shells make: |
364 (let (dirname) | 364 (let (dirname) |
365 (if (consp dir-or-list) | 365 (if (consp dir-or-list) |
366 (setq dirname (car dir-or-list)) | 366 (setq dirname (car dir-or-list)) |
367 (setq dirname dir-or-list)) | 367 (setq dirname dir-or-list)) |
368 (setq dirname (expand-file-name (directory-file-name dirname))) | 368 (setq dirname (abbreviate-file-name |
369 (expand-file-name (directory-file-name dirname)))) | |
369 (if (file-directory-p dirname) | 370 (if (file-directory-p dirname) |
370 (setq dirname (file-name-as-directory dirname))) | 371 (setq dirname (file-name-as-directory dirname))) |
371 (if (consp dir-or-list) | 372 (if (consp dir-or-list) |
372 (setq dir-or-list (cons dirname (cdr dir-or-list))) | 373 (setq dir-or-list (cons dirname (cdr dir-or-list))) |
373 (setq dir-or-list dirname)) | 374 (setq dir-or-list dirname)) |
408 (= (nth 1 (nth 5 attributes)) (cdr modtime))))) | 409 (= (nth 1 (nth 5 attributes)) (cdr modtime))))) |
409 nil | 410 nil |
410 (message "Directory has changed on disk; type `g' to update Dired"))) | 411 (message "Directory has changed on disk; type `g' to update Dired"))) |
411 ;; Else a new buffer | 412 ;; Else a new buffer |
412 (setq default-directory | 413 (setq default-directory |
413 (abbreviate-file-name | 414 (if (file-directory-p dirname) |
414 (if (file-directory-p dirname) | 415 dirname |
415 dirname | 416 (file-name-directory dirname))) |
416 (file-name-directory dirname)))) | |
417 (or switches (setq switches dired-listing-switches)) | 417 (or switches (setq switches dired-listing-switches)) |
418 (dired-mode dirname switches) | 418 (dired-mode dirname switches) |
419 ;; default-directory and dired-actual-switches are set now | 419 ;; default-directory and dired-actual-switches are set now |
420 ;; (buffer-local), so we can call dired-readin: | 420 ;; (buffer-local), so we can call dired-readin: |
421 (let ((failed t)) | 421 (let ((failed t)) |