[Emacs-diffs] Changes to emacs/lisp/dired.el

[Richard M. Stallman]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.221 emacs/lisp/dired.el:1.222
*** emacs/lisp/dired.el:1.221   Mon Feb  4 14:38:29 2002
--- emacs/lisp/dired.el Wed Feb  6 10:30:40 2002
***************
*** 1425,1438 ****
         (not default-file-name-coding-system)
         (setq file (encode-coding-string file buffer-file-coding-system)))
      (cond
       ((eq localp 'verbatim)
        file)
       ((and (eq localp 'no-dir) already-absolute)
        (file-name-nondirectory file))
!      ((or already-absolute (eq localp 'no-dir))
        file)
       (t
!       (and file (concat (dired-current-directory localp) file))))))
  
  (defun dired-string-replace-match (regexp string newtext
                                          &optional literal global)
--- 1425,1449 ----
         (not default-file-name-coding-system)
         (setq file (encode-coding-string file buffer-file-coding-system)))
      (cond
+      ((null file)
+       nil)
       ((eq localp 'verbatim)
        file)
       ((and (eq localp 'no-dir) already-absolute)
        (file-name-nondirectory file))
!      (already-absolute
!       (if (find-file-name-handler file nil)
!         (concat "/:" file)
!       file))
!      ((eq localp 'no-dir)
        file)
+      ((equal (dired-current-directory) "/")
+       (setq file (concat (dired-current-directory localp) file))
+       (if (find-file-name-handler file nil)
+         (concat "/:" file)
+       file))
       (t
!       (concat (dired-current-directory localp) file)))))
  
  (defun dired-string-replace-match (regexp string newtext
                                          &optional literal global)