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

[Juanma Barranquero]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.260 emacs/lisp/dired.el:1.261
*** emacs/lisp/dired.el:1.260   Wed Jun  4 05:02:45 2003
--- emacs/lisp/dired.el Thu Jun  5 18:00:13 2003
***************
*** 1367,1373 ****
  (defun dired-find-file ()
    "In Dired, visit the file or directory named on this line."
    (interactive)
!   ;; Bind `find-file-run-dired' so that the command works on directories 
    ;; too, independent of the user's setting.
    (let ((find-file-run-dired t))
      (find-file (dired-get-file-for-visit))))
--- 1367,1373 ----
  (defun dired-find-file ()
    "In Dired, visit the file or directory named on this line."
    (interactive)
!   ;; Bind `find-file-run-dired' so that the command works on directories
    ;; too, independent of the user's setting.
    (let ((find-file-run-dired t))
      (find-file (dired-get-file-for-visit))))
***************
*** 1487,1499 ****
      (cond
       ((null file)
        nil)
       ((and (not no-error-if-not-filep)
           (save-excursion
             (beginning-of-line)
             (looking-at dired-re-dir)))
        (error "Cannot operate on `.' or `..'"))
-      ((eq localp 'verbatim)
-       file)
       ((and (eq localp 'no-dir) already-absolute)
        (file-name-nondirectory file))
       (already-absolute
--- 1487,1499 ----
      (cond
       ((null file)
        nil)
+      ((eq localp 'verbatim)
+       file)
       ((and (not no-error-if-not-filep)
           (save-excursion
             (beginning-of-line)
             (looking-at dired-re-dir)))
        (error "Cannot operate on `.' or `..'"))
       ((and (eq localp 'no-dir) already-absolute)
        (file-name-nondirectory file))
       (already-absolute
***************
*** 1519,1525 ****
        (concat (dired-current-directory localp) file)))))
  
  (defun dired-string-replace-match (regexp string newtext
!                                         &optional literal global)
    "Replace first match of REGEXP in STRING with NEWTEXT.
  If it does not match, nil is returned instead of the new string.
  Optional arg LITERAL means to take NEWTEXT literally.
--- 1519,1525 ----
        (concat (dired-current-directory localp) file)))))
  
  (defun dired-string-replace-match (regexp string newtext
!                                    &optional literal global)
    "Replace first match of REGEXP in STRING with NEWTEXT.
  If it does not match, nil is returned instead of the new string.
  Optional arg LITERAL means to take NEWTEXT literally.