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

[Juanma Barranquero]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.252 emacs/lisp/dired.el:1.253
*** emacs/lisp/dired.el:1.252   Tue Jan 14 18:10:14 2003
--- emacs/lisp/dired.el Fri Jan 31 10:14:50 2003
***************
*** 65,71 ****
  
  ;;;###autoload
  (defvar dired-chown-program
!   (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux))
        "chown"
      (if (file-exists-p "/usr/sbin/chown")
        "/usr/sbin/chown"
--- 65,71 ----
  
  ;;;###autoload
  (defvar dired-chown-program
!   (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux cygwin))
        "chown"
      (if (file-exists-p "/usr/sbin/chown")
        "/usr/sbin/chown"
***************
*** 299,305 ****
         '(".+" (dired-move-to-filename) nil (0 font-lock-function-name-face)))
     ;;
     ;; Symbolic links.
!    (list dired-re-sym 
         '(".+" (dired-move-to-filename) nil (0 font-lock-keyword-face)))
     ;;
     ;; Files suffixed with `completion-ignored-extensions'.
--- 299,305 ----
         '(".+" (dired-move-to-filename) nil (0 font-lock-function-name-face)))
     ;;
     ;; Symbolic links.
!    (list dired-re-sym
         '(".+" (dired-move-to-filename) nil (0 font-lock-keyword-face)))
     ;;
     ;; Files suffixed with `completion-ignored-extensions'.
***************
*** 530,540 ****
          (setq buffer (create-file-buffer (directory-file-name dirname)))))
      (set-buffer buffer)
      (if (not new-buffer-p)     ; existing buffer ...
!       (cond (switches        ; ... but new switches     
               ;; file list may have changed
               (setq dired-directory dir-or-list)
               ;; this calls dired-revert
!              (dired-sort-other switches))  
              ;; If directory has changed on disk, offer to revert.
              ((if (let ((attributes (file-attributes dirname))
                         (modtime (visited-file-modtime)))
--- 530,540 ----
          (setq buffer (create-file-buffer (directory-file-name dirname)))))
      (set-buffer buffer)
      (if (not new-buffer-p)     ; existing buffer ...
!       (cond (switches        ; ... but new switches
               ;; file list may have changed
               (setq dired-directory dir-or-list)
               ;; this calls dired-revert
!              (dired-sort-other switches))
              ;; If directory has changed on disk, offer to revert.
              ((if (let ((attributes (file-attributes dirname))
                         (modtime (visited-file-modtime)))
***************
*** 1769,1775 ****
             (substring pattern matched-in-pattern))
            "\\'")))
  
!                
  
  (defun dired-advertise ()
    ;;"Advertise in variable `dired-buffers' that we dired `default-directory'."
--- 1769,1775 ----
             (substring pattern matched-in-pattern))
            "\\'")))
  
! 
  
  (defun dired-advertise ()
    ;;"Advertise in variable `dired-buffers' that we dired `default-directory'."
***************
*** 2053,2059 ****
                 (const :tag "Confirm for each top directory only" top))
    :group 'dired)
  
! ;; Match anything but `.' and `..'. 
  (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")
  
  ;; Delete file, possibly delete a directory and all its files.
--- 2053,2059 ----
                 (const :tag "Confirm for each top directory only" top))
    :group 'dired)
  
! ;; Match anything but `.' and `..'.
  (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")
  
  ;; Delete file, possibly delete a directory and all its files.
***************
*** 2174,2180 ****
            (setq success-list (cons (buffer-name buf) success-list)))))
      success-list))
  
! ;; Delete the entry for FILE from 
  (defun dired-delete-entry (file)
    (save-excursion
      (and (dired-goto-file file)
--- 2174,2180 ----
            (setq success-list (cons (buffer-name buf) success-list)))))
      success-list))
  
! ;; Delete the entry for FILE from
  (defun dired-delete-entry (file)
    (save-excursion
      (and (dired-goto-file file)
***************
*** 2572,2578 ****
  (defvar dired-garbage-files-regexp
    (concat (regexp-opt
           '(".log" ".toc" ".dvi" ".bak" ".orig" ".rej" ".aux"))
!         "\\'") 
    "*Regular expression to match \"garbage\" files for 
`dired-flag-garbage-files'.")
  
  (defun dired-flag-garbage-files ()
--- 2572,2578 ----
  (defvar dired-garbage-files-regexp
    (concat (regexp-opt
           '(".log" ".toc" ".dvi" ".bak" ".orig" ".rej" ".aux"))
!         "\\'")
    "*Regular expression to match \"garbage\" files for 
`dired-flag-garbage-files'.")
  
  (defun dired-flag-garbage-files ()
***************
*** 2632,2638 ****
  
  (defun dired-unmark-all-files (mark &optional arg)
    "Remove a specific mark (or any mark) from every file.
! After this command, type the mark character to remove, 
  or type RET to remove all marks.
  With prefix arg, query for each marked file.
  Type \\[help-command] at that time for help."
--- 2632,2638 ----
  
  (defun dired-unmark-all-files (mark &optional arg)
    "Remove a specific mark (or any mark) from every file.
! After this command, type the mark character to remove,
  or type RET to remove all marks.
  With prefix arg, query for each marked file.
  Type \\[help-command] at that time for help."
***************
*** 2683,2689 ****
    ;; Log a message or the contents of a buffer.
    ;; If LOG is a string and there are more args, it is formatted with
    ;; those ARGS.  Usually the LOG string ends with a \n.
!   ;; End each bunch of errors with (dired-log t): 
    ;; this inserts the current time and buffer at the start of the page,
    ;; and \f (formfeed) at the end.
    (let ((obuf (current-buffer)))
--- 2683,2689 ----
    ;; Log a message or the contents of a buffer.
    ;; If LOG is a string and there are more args, it is formatted with
    ;; those ARGS.  Usually the LOG string ends with a \n.
!   ;; End each bunch of errors with (dired-log t):
    ;; this inserts the current time and buffer at the start of the page,
    ;; and \f (formfeed) at the end.
    (let ((obuf (current-buffer)))
***************
*** 3076,3082 ****
  (autoload 'dired-show-file-type "dired-aux"
    "Print the type of FILE, according to the `file' command.
  If FILE is a symbolic link and the optional argument DEREF-SYMLINKS is
! true then the type of the file linked to by FILE is printed instead." 
    t)
  
  (autoload 'dired-run-shell-command "dired-aux")
--- 3076,3082 ----
  (autoload 'dired-show-file-type "dired-aux"
    "Print the type of FILE, according to the `file' command.
  If FILE is a symbolic link and the optional argument DEREF-SYMLINKS is
! true then the type of the file linked to by FILE is printed instead."
    t)
  
  (autoload 'dired-run-shell-command "dired-aux")