[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.11 emacs/lisp/dired.el:1.230.2.12
*** emacs/lisp/dired.el:1.230.2.11      Tue Jul  6 09:38:06 2004
--- emacs/lisp/dired.el Tue Jul  6 09:44:43 2004
***************
*** 60,65 ****
--- 60,69 ----
    :type 'string
    :group 'dired)
  
+ (defvar dired-subdir-switches nil
+   "If non-nil, switches passed to `ls' for inserting subdirectories.
+ If nil, `dired-listing-switches' is used.")
+ 
  ; Don't use absolute file names as /bin should be in any PATH and people
  ; may prefer /usr/local/gnu/bin or whatever.  However, chown is
  ; usually not in PATH.
***************
*** 274,286 ****
  (defvar dired-re-perms "[-bcdlps][-r][-w].[-r][-w].[-r][-w].")
  (defvar dired-re-dot "^.* \\.\\.?/?$")
  
! ;; The subdirectory names in this list are expanded.
  (defvar dired-subdir-alist nil
    "Association list of subdirectories and their buffer positions.
  Each subdirectory has an element: (DIRNAME . STARTMARKER).
  The order of elements is the reverse of the order in the buffer.
  In simple cases, this list contains one element.")
  
  (defvar dired-subdir-regexp "^. \\([^\n\r]+\\)\\(:\\)[\n\r]"
    "Regexp matching a maybe hidden subdirectory line in `ls -lR' output.
  Subexpression 1 is the subdirectory proper, no trailing colon.
--- 278,295 ----
  (defvar dired-re-perms "[-bcdlps][-r][-w].[-r][-w].[-r][-w].")
  (defvar dired-re-dot "^.* \\.\\.?/?$")
  
! ;; The subdirectory names in the next two lists are expanded.
  (defvar dired-subdir-alist nil
    "Association list of subdirectories and their buffer positions.
  Each subdirectory has an element: (DIRNAME . STARTMARKER).
  The order of elements is the reverse of the order in the buffer.
  In simple cases, this list contains one element.")
  
+ (defvar dired-switches-alist nil
+   "Keeps track of which switches to use for inserted subdirectories.
+ This is an alist of the form (SUBDIR . SWITCHES).")
+ (make-variable-buffer-local 'dired-switches-alist)
+ 
  (defvar dired-subdir-regexp "^. \\([^\n\r]+\\)\\(:\\)[\n\r]"
    "Regexp matching a maybe hidden subdirectory line in `ls -lR' output.
  Subexpression 1 is the subdirectory proper, no trailing colon.
***************
*** 961,967 ****
          (condition-case ()
              (progn
                (dired-uncache dir)
!               (dired-insert-subdir dir))
            (error nil))))))
  
  (defun dired-uncache (dir)
--- 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)
***************
*** 1406,1411 ****
--- 1422,1428 ----
         '(dired-font-lock-keywords t nil nil beginning-of-line))
    (set (make-local-variable 'desktop-save-buffer)
         'dired-desktop-buffer-misc-data)
+   (setq dired-switches-alist nil)
    (dired-sort-other dired-actual-switches t)
    (run-mode-hooks 'dired-mode-hook)
    (when (featurep 'x-dnd)
***************
*** 2073,2079 ****
                             (goto-char (match-beginning 0))
                             (beginning-of-line)
                             (point-marker))))
!       (if (> count 1)
          (message "Buffer includes %d directories" count))
        ;; We don't need to sort it because it is in buffer order per
        ;; constructionem.  Return new alist:
--- 2090,2096 ----
                             (goto-char (match-beginning 0))
                             (beginning-of-line)
                             (point-marker))))
!       (if (and (> count 1) (interactive-p))
          (message "Buffer includes %d directories" count))
        ;; We don't need to sort it because it is in buffer order per
        ;; constructionem.  Return new alist:
***************
*** 3274,3289 ****
        nil)))
  
  (defun dired-dnd-popup-notice ()
!   (x-popup-dialog 
     t
!    '("Recursive copies not enabled.\nSee variable dired-recursive-copies." 
       ("Ok" . nil))))
  
  
  (defun dired-dnd-do-ask-action (uri)
    ;; No need to get actions and descriptions from the source,
    ;; we only have three actions anyway.
!   (let ((action (x-popup-menu 
                 t
                 (list "What action?"
                       (cons ""
--- 3291,3306 ----
        nil)))
  
  (defun dired-dnd-popup-notice ()
!   (x-popup-dialog
     t
!    '("Recursive copies not enabled.\nSee variable dired-recursive-copies."
       ("Ok" . nil))))
  
  
  (defun dired-dnd-do-ask-action (uri)
    ;; No need to get actions and descriptions from the source,
    ;; we only have three actions anyway.
!   (let ((action (x-popup-menu
                 t
                 (list "What action?"
                       (cons ""