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

[Miles Bader]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.230.2.13 emacs/lisp/dired.el:1.230.2.14
*** emacs/lisp/dired.el:1.230.2.13      Tue Jul  6 09:47:52 2004
--- emacs/lisp/dired.el Tue Jul  6 10:00:03 2004
***************
*** 970,983 ****
          (condition-case ()
              (progn
                (dired-uncache dir)
!               (dired-insert-subdir dir)
!               (let ((switches (cdr (assoc-string dir dired-switches-alist))))
!                 (and switches
!                      (string-match "R" switches)
!                      (dolist (cur-ass (copy-sequence old-subdir-alist))
!                        (when (dired-in-this-tree (car cur-ass) dir)
!                          (setq old-subdir-alist
!                                (delete cur-ass old-subdir-alist)))))))
            (error nil))))))
  
  (defun dired-uncache (dir)
--- 970,976 ----
          (condition-case ()
              (progn
                (dired-uncache dir)
!               (dired-insert-subdir dir))
            (error nil))))))
  
  (defun dired-uncache (dir)
***************
*** 3036,3279 ****
            ;; listing:
            (list (car (reverse dired-subdir-alist))))))))
  
- ;; To make this file smaller, the less common commands
- ;; go in a separate file.  But autoload them here
- ;; to make the separation invisible.
- 
- (autoload 'dired-diff "dired-aux"
-   "Compare file at point with file FILE using `diff'.
- FILE defaults to the file at the mark.  (That's the mark set by
- \\[set-mark-command], not by Dired's \\[dired-mark] command.)
- The prompted-for file is the first file given to `diff'."
-   t)
- 
- (autoload 'dired-backup-diff "dired-aux"
-   "Diff this file with its backup file or vice versa.
- Uses the latest backup, if there are several numerical backups.
- If this file is a backup, diff it with its original.
- The backup file is the first file given to `diff'."
-   t)
- 
- (autoload 'dired-clean-directory "dired-aux"
-   "Flag numerical backups for deletion.
- Spares `dired-kept-versions' latest versions, and `kept-old-versions' oldest.
- Positive prefix arg KEEP overrides `dired-kept-versions';
- Negative prefix arg KEEP overrides `kept-old-versions' with KEEP made 
positive.
- 
- To clear the flags on these files, you can use \\[dired-flag-backup-files]
- with a prefix argument."
-   t)
- 
- (autoload 'dired-do-chmod "dired-aux"
-   "Change the mode of the marked (or next ARG) files.
- This calls chmod, thus symbolic modes like `g+w' are allowed."
-   t)
- 
- (autoload 'dired-do-chgrp "dired-aux"
-   "Change the group of the marked (or next ARG) files."
-   t)
- 
- (autoload 'dired-do-chown "dired-aux"
-   "Change the owner of the marked (or next ARG) files."
-   t)
- 
- (autoload 'dired-do-touch "dired-aux"
-   "Change the timestamp of the marked (or next ARG) files."
-   t)
- 
- (autoload 'dired-do-print "dired-aux"
-   "Print the marked (or next ARG) files.
- Uses the shell command coming from variables `lpr-command' and
- `lpr-switches' as default."
-   t)
- 
- (autoload 'dired-do-shell-command "dired-aux"
-   "Run a shell command COMMAND on the marked files.
- If no files are marked or a specific numeric prefix arg is given,
- the next ARG files are used.  Just \\[universal-argument] means the current 
file.
- The prompt mentions the file(s) or the marker, as appropriate.
- 
- If there is a `*' in COMMAND, surrounded by whitespace, this runs
- COMMAND just once with the entire file list substituted there.
- 
- If there is no `*', but there is a `?' in COMMAND, surrounded by
- whitespace, this runs COMMAND on each file individually with the
- file name substituted for `?'.
- 
- Otherwise, this runs COMMAND on each file individually with the
- file name added at the end of COMMAND (separated by a space).
- 
- `*' and `?' when not surrounded by whitespace have no special
- significance for `dired-do-shell-command', and are passed through
- normally to the shell, but you must confirm first.  To pass `*' by
- itself to the shell as a wildcard, type `*\"\"'.
- 
- If COMMAND produces output, it goes to a separate buffer.
- 
- This feature does not try to redisplay Dired buffers afterward, as
- there's no telling what files COMMAND may have changed.
- Type \\[dired-do-redisplay] to redisplay the marked files.
- 
- When COMMAND runs, its working directory is the top-level directory of
- the Dired buffer, so output files usually are created there instead of
- in a subdir.
- 
- In a noninteractive call (from Lisp code), you must specify
- the list of file names explicitly with the FILE-LIST argument."
-   t)
- 
- (autoload 'dired-do-kill-lines "dired-aux"
-   "Kill all marked lines (not the files).
- With a prefix arg, kill all lines not marked or flagged."
-   t)
- 
- (autoload 'dired-do-compress "dired-aux"
-   "Compress or uncompress marked (or next ARG) files."
-   t)
- 
- (autoload 'dired-do-byte-compile "dired-aux"
-   "Byte compile marked (or next ARG) Emacs Lisp files."
-   t)
- 
- (autoload 'dired-do-load "dired-aux"
-   "Load the marked (or next ARG) Emacs Lisp files."
-   t)
- 
- (autoload 'dired-do-redisplay "dired-aux"
-   "Redisplay all marked (or next ARG) files.
- If on a subdir line, redisplay that subdirectory.  In that case,
- a prefix arg lets you edit the `ls' switches used for the new listing."
-   t)
- 
- (autoload 'dired-create-directory "dired-aux"
-   "Create a directory called DIRECTORY."
-   t)
- 
- (autoload 'dired-do-copy "dired-aux"
-   "Copy all marked (or next ARG) files, or copy the current file.
- Thus, a zero prefix argument copies nothing.  But it toggles the
- variable `dired-copy-preserve-time' (which see)."
-   t)
- 
- (autoload 'dired-do-symlink "dired-aux"
-   "Make symbolic links to current file or all marked (or next ARG) files.
- When operating on just the current file, you specify the new name.
- When operating on multiple or marked files, you specify a directory
- and new symbolic links are made in that directory
- with the same names that the files currently have."
-   t)
- 
- (autoload 'dired-do-hardlink "dired-aux"
-   "Add names (hard links) current file or all marked (or next ARG) files.
- When operating on just the current file, you specify the new name.
- When operating on multiple or marked files, you specify a directory
- and new hard links are made in that directory
- with the same names that the files currently have."
-   t)
- 
- (autoload 'dired-do-rename "dired-aux"
-   "Rename current file or all marked (or next ARG) files.
- When renaming just the current file, you specify the new name.
- When renaming multiple or marked files, you specify a directory."
-   t)
- 
- (autoload 'dired-do-rename-regexp "dired-aux"
-   "Rename marked files containing REGEXP to NEWNAME.
- As each match is found, the user must type a character saying
-   what to do with it.  For directions, type \\[help-command] at that time.
- NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'.
- REGEXP defaults to the last regexp used.
- With a zero prefix arg, renaming by regexp affects the full file name;
- usually only the non-directory part of file names is used and changed."
-   t)
- 
- (autoload 'dired-do-copy-regexp "dired-aux"
-   "Copy all marked files containing REGEXP to NEWNAME.
- See function `dired-do-rename-regexp' for more info."
-   t)
- 
- (autoload 'dired-do-hardlink-regexp "dired-aux"
-   "Hardlink all marked files containing REGEXP to NEWNAME.
- See function `dired-do-rename-regexp' for more info."
-   t)
- 
- (autoload 'dired-do-symlink-regexp "dired-aux"
-   "Symlink all marked files containing REGEXP to NEWNAME.
- See function `dired-do-rename-regexp' for more info."
-   t)
- 
- (autoload 'dired-upcase "dired-aux"
-   "Rename all marked (or next ARG) files to upper case."
-   t)
- 
- (autoload 'dired-downcase "dired-aux"
-   "Rename all marked (or next ARG) files to lower case."
-   t)
- 
- (autoload 'dired-maybe-insert-subdir "dired-aux"
-   "Insert this subdirectory into the same dired buffer.
- If it is already present, just move to it (type \\[dired-do-redisplay] to 
refresh),
-   else inserts it at its natural place (as `ls -lR' would have done).
- With a prefix arg, you may edit the ls switches used for this listing.
-   You can add `R' to the switches to expand the whole tree starting at
-   this subdirectory.
- This function takes some pains to conform to `ls -lR' output."
-   t)
- 
- (autoload 'dired-next-subdir "dired-aux"
-   "Go to next subdirectory, regardless of level."
-   t)
- 
- (autoload 'dired-prev-subdir "dired-aux"
-   "Go to previous subdirectory, regardless of level.
- When called interactively and not on a subdir line, go to this subdir's line."
-   t)
- 
- (autoload 'dired-goto-subdir "dired-aux"
-   "Go to end of header line of DIR in this dired buffer.
- Return value of point on success, otherwise return nil.
- The next char is either \\n, or \\r if DIR is hidden."
-   t)
- 
- (autoload 'dired-mark-subdir-files "dired-aux"
-   "Mark all files except `.' and `..'."
-   t)
- 
- (autoload 'dired-kill-subdir "dired-aux"
-   "Remove all lines of current subdirectory.
- Lower levels are unaffected."
-   t)
- 
- (autoload 'dired-tree-up "dired-aux"
-   "Go up ARG levels in the dired tree."
-   t)
- 
- (autoload 'dired-tree-down "dired-aux"
-   "Go down in the dired tree."
-   t)
- 
- (autoload 'dired-hide-subdir "dired-aux"
-   "Hide or unhide the current subdirectory and move to next directory.
- Optional prefix arg is a repeat factor.
- Use \\[dired-hide-all] to (un)hide all directories."
-   t)
- 
- (autoload 'dired-hide-all "dired-aux"
-   "Hide all subdirectories, leaving only their header lines.
- If there is already something hidden, make everything visible again.
- Use \\[dired-hide-subdir] to (un)hide a particular subdirectory."
-   t)
- 
- (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")
- 
- (autoload 'dired-query "dired-aux")
- 
  
  ;;;;  Drag and drop support
  
--- 3029,3034 ----