[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/dired.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/dired.el [lexbind] |
Date: |
Wed, 08 Dec 2004 19:36:05 -0500 |
Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.230.2.19 emacs/lisp/dired.el:1.230.2.20
*** emacs/lisp/dired.el:1.230.2.19 Fri Nov 12 04:21:13 2004
--- emacs/lisp/dired.el Wed Dec 8 23:36:20 2004
***************
*** 1,7 ****
;;; dired.el --- directory-browsing commands
! ;; Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 97, 2000, 01, 03, 2004
! ;; Free Software Foundation, Inc.
;; Author: Sebastian Kremer <address@hidden>
;; Maintainer: FSF
--- 1,7 ----
;;; dired.el --- directory-browsing commands
! ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000,
! ;; 2001, 2003, 2004 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <address@hidden>
;; Maintainer: FSF
***************
*** 741,747 ****
(defun dired-readin ()
"Read in a new dired buffer.
! Differs from dired-insert-subdir in that it accepts
wildcards, erases the buffer, and builds the subdir-alist anew
\(including making it buffer-local and clearing it first)."
--- 741,747 ----
(defun dired-readin ()
"Read in a new dired buffer.
! Differs from `dired-insert-subdir' in that it accepts
wildcards, erases the buffer, and builds the subdir-alist anew
\(including making it buffer-local and clearing it first)."
***************
*** 858,867 ****
(setq file (copy-marker file))
;; Main loop.
(goto-char beg)
(while (and (> other-col file-col)
- (skip-chars-forward "^ ")
- ;; Skip the spaces, and make sure there's at least one.
- (> (skip-chars-forward " ") 0)
;; Don't touch anything just before (and after) the
;; beginning of the filename.
(> file (point)))
--- 858,865 ----
(setq file (copy-marker file))
;; Main loop.
(goto-char beg)
+ (skip-chars-forward " ") ;Skip to the first field.
(while (and (> other-col file-col)
;; Don't touch anything just before (and after) the
;; beginning of the filename.
(> file (point)))
***************
*** 904,914 ****
(insert-char ?\s spaces)
;; Let's just make really sure we did not mess up.
(unless (save-excursion
! (equal (dired-move-to-filename) (marker-position file)))
;; Damn! We messed up: let's revert the change.
! (delete-char (- spaces))))))
(set-marker file nil)))))
!
(defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
"Insert a directory listing of DIR, Dired style.
--- 902,914 ----
(insert-char ?\s spaces)
;; Let's just make really sure we did not mess up.
(unless (save-excursion
! (eq (dired-move-to-filename) (marker-position file)))
;; Damn! We messed up: let's revert the change.
! (delete-char (- spaces)))))
! ;; Now skip to next field.
! (skip-chars-forward "^ ") (skip-chars-forward " "))
(set-marker file nil)))))
!
(defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
"Insert a directory listing of DIR, Dired style.
***************
*** 1482,1503 ****
Customization variables (rename this buffer and type \\[describe-variable] on
each line
for more info):
! dired-listing-switches
! dired-trivial-filenames
! dired-shrink-to-fit
! dired-marker-char
! dired-del-marker
! dired-keep-marker-rename
! dired-keep-marker-copy
! dired-keep-marker-hardlink
! dired-keep-marker-symlink
Hooks (use \\[describe-variable] to see their documentation):
! dired-before-readin-hook
! dired-after-readin-hook
! dired-mode-hook
! dired-load-hook
Keybindings:
\\{dired-mode-map}"
--- 1482,1503 ----
Customization variables (rename this buffer and type \\[describe-variable] on
each line
for more info):
! `dired-listing-switches'
! `dired-trivial-filenames'
! `dired-shrink-to-fit'
! `dired-marker-char'
! `dired-del-marker'
! `dired-keep-marker-rename'
! `dired-keep-marker-copy'
! `dired-keep-marker-hardlink'
! `dired-keep-marker-symlink'
Hooks (use \\[describe-variable] to see their documentation):
! `dired-before-readin-hook'
! `dired-after-readin-hook'
! `dired-mode-hook'
! `dired-load-hook'
Keybindings:
\\{dired-mode-map}"
***************
*** 1508,1514 ****
(dired-advertise) ; default-directory is already set
(setq major-mode 'dired-mode
mode-name "Dired"
! ;; case-fold-search nil
buffer-read-only t
selective-display t ; for subdirectory hiding
mode-line-buffer-identification
--- 1508,1514 ----
(dired-advertise) ; default-directory is already set
(setq major-mode 'dired-mode
mode-name "Dired"
! ;; case-fold-search nil
buffer-read-only t
selective-display t ; for subdirectory hiding
mode-line-buffer-identification
***************
*** 3021,3027 ****
;; So anything that does not contain these is sort "by name".
(defvar dired-ls-sorting-switches "SXU"
! "String of `ls' switches \(single letters\) except `t' that influence
sorting.
This indicates to Dired which option switches to watch out for because they
will change the sorting order behavior of `ls'.
--- 3021,3027 ----
;; So anything that does not contain these is sort "by name".
(defvar dired-ls-sorting-switches "SXU"
! "String of `ls' switches \(single letters\) except \"t\" that influence
sorting.
This indicates to Dired which option switches to watch out for because they
will change the sorting order behavior of `ls'.
***************
*** 3153,3158 ****
--- 3153,3171 ----
;;;; Drag and drop support
+ (defcustom dired-recursive-copies nil
+ "*Decide whether recursive copies are allowed.
+ nil means no recursive copies.
+ `always' means copy recursively without asking.
+ `top' means ask for each directory at top level.
+ Anything else means ask for each directory."
+ :type '(choice :tag "Copy directories"
+ (const :tag "No recursive copies" nil)
+ (const :tag "Ask for each directory" t)
+ (const :tag "Ask for each top directory only" top)
+ (const :tag "Copy directories without asking" always))
+ :group 'dired)
+
(defun dired-dnd-test-function (window action types)
"The test function for drag and drop into dired buffers.
WINDOW is where the mouse is when this function is called. It may be a frame
***************
*** 3286,3290 ****
(run-hooks 'dired-load-hook) ; for your customizations
! ;;; arch-tag: e1af7a8f-691c-41a0-aac1-ddd4d3c87517
;;; dired.el ends here
--- 3299,3303 ----
(run-hooks 'dired-load-hook) ; for your customizations
! ;; arch-tag: e1af7a8f-691c-41a0-aac1-ddd4d3c87517
;;; dired.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/dired.el [lexbind],
Miles Bader <=