CVS update by michaels packages/xemacs-packages/dired,
Makefile.dired, dired-faces.el, dired-mob.el, dired-rgxp.el,
dired-uu.el, dired-xy.el ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Sun Nov 11 10:41:23 EST 2007
User: michaels
Date: 07/11/11 16:41:23
Modified: packages/xemacs-packages/dired ChangeLog Makefile
Makefile.dired README dired-cmpr.el dired-diff.el
dired-faces.el dired-grep.el dired-help.el
dired-mob.el dired-mule.el dired-oas.el
dired-rgxp.el dired-sex.el dired-shell.el
dired-uu.el dired-vir.el dired-xemacs.el
dired-xy.el dired.el
Log:
Dired 7.14
Revision Changes Path
1.22 +101 -34 XEmacs/packages/xemacs-packages/dired/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ChangeLog 2005/04/09 20:24:54 1.21
+++ ChangeLog 2007/11/11 15:41:17 1.22
@@ -1,7 +1,74 @@
-2005-04-09 Norbert Koch <viteno at xemacs.org>
+2007-11-11 Michael Sperber <sperber at deinprogramm.de>
- * Makefile (VERSION): XEmacs package 1.17 released.
+ * Dired 7.14
+2007-11-11 Michael Sperber <sperber at deinprogramm.de>
+
+ * dired.el (dired-ls-locale): Add.
+ (dired-call-insert-directory): Add, respecting `dired-ls-locale'.
+ (dired-insert-directory):
+ (dired-insert-subdir-doinsert):
+ (dired-add-entry): Use `dired-call-insert-directory' instead of
+ `insert-directory'.
+
+2007-09-17 Didier Verna <didier at xemacs.org>
+
+ * dired.el (dired-cleanup-alist): Fix misuse of the 'list widget
+ type.
+ * dired.el (dired-omit-extensions): Ditto.
+ * dired.el (dired-omit-regexps): Ditto.
+
+2007-08-27 Michael Sperber <sperber at informatik.uni-tuebingen.de>
+
+ * dired-xemacs.el (dired-install-menubar): Correctly insert
+ single-line separator into help menu.
+
+2007-08-21 Adrian Aichner <adrian at xemacs.org>
+
+ * dired-shell.el (dired-shell-quote): Don't quote +.
+
+2007-02-05 Michael Sperber <sperber at informatik.uni-tuebingen.de>
+
+ * dired.el (dired-copy-file-recursive): Parameterize over
+ `copy-file' function, to enable recursive copying over EFS.
+ (Needs a corresponding change in EFS.)
+
+2006-12-30 Mats Lidell <matsl at xemacs.org>
+
+ * dired.el (dired-re-month-and-time): Synch with FSF files.el.
+
+2006-08-15 Adrian Aichner <adrian at xemacs.org>
+
+ * dired.el (dired-collect-file-versions): XEmacs 21.5 makes use of
+ backup-extract-version-start.
+ * dired.el (dired-trample-file-versions): Ditto.
+
+2005-06-25 Adrian Aichner <adrian at xemacs.org>
+
+ * dired-xemacs.el (dired-install-menubar): dired to add itself to
+ Help menu only once.
+
+2006-02-26 Michael Sperber <sperber at informatik.uni-tuebingen.de>
+
+ * dired-shell.el (dired-shell-quote): Use `shell-quote-argument'
+ if present.
+
+2006-02-26 Marcus Harnisch <Marcus.Harnisch at schleicher-electronic.com>
+
+ * dired-rgxp.el (dired-mark-read-regexp): Regexp-quote the default
+ value of the new name.
+
+2005-05-03 Malcolm Purvis <malcolmp at xemacs.org>
+
+ * dired-xemacs.el (dired-install-menubar): Use proper form for
+ separator in help menu. Thanks to nelson.ferreira at ieee.org for
+ reporting the bug.
+
+2005-04-16 Michael Sperber <sperber at informatik.uni-tuebingen.de>
+
+ * dired-xemacs.el (dired-set-text-properties): Use
+ `dired-filename-extents' instead of `extent-list.'
+
2005-04-09 Mike Sperber <sperber at informatik.uni-tuebingen.de>
* Dired 7.13.
@@ -10,8 +77,8 @@
2005-02-23 Michael Sperber <sperber at informatik.uni-tuebingen.de>
- * dired-xemacs.el (dired-maybe-filename-start):
- (dired-maybe-filename-end):
+ * dired-xemacs.el (dired-maybe-filename-start):
+ (dired-maybe-filename-end):
(dired-filename-extents): Introduce `dired-filename-extents,'
which we use now instead of `extent-list,', the previous usage of
which isn't in XEmacs 21.1.
@@ -22,9 +89,9 @@
(dired-after-add-entry): Use `dired-align-file'.
2004-09-28 Stefan Monnier <monnier at iro.umontreal.ca>
-
+
(dired-align-file): New function.
-
+
2005-01-14 Steve Youngs <steve at sxemacs.org>
* dired.el: Use `emacs-*-version' variables for finding version
@@ -62,13 +129,13 @@
2003-08-30 Mike Sperber <sperber at informatik.uni-tuebingen.de>
- * dired.el (dired-noselect):
+ * dired.el (dired-noselect):
(dired-find-buffer-nocreate): Only access
`find-file-compare-truenames' if it's bound.
2003-08-19 René Kyllingstad <kyllingstad at users.sourceforge.net>
- * dired.el (dired-noselect):
+ * dired.el (dired-noselect):
(dired-find-file-compare-truenames):
(dired-find-buffer-nocreate): Opening a dired buffer with
find-file-compare-truenames non-nil is very slow on win32, yet it
@@ -98,12 +165,12 @@
(dired-manual-move-to-end-of-filename): Use
`dired-maybe-filename-end'.
- * dired-xemacs.el (dired-maybe-filename-start):
+ * dired-xemacs.el (dired-maybe-filename-start):
(dired-maybe-filename-end): Added.
(dired-set-text-properties): Don't create new extent if there's
one already there.
- * dired-fsf.el (dired-maybe-filename-start):
+ * dired-fsf.el (dired-maybe-filename-start):
(dired-maybe-filename-end): Added. (Completely untested.)
2003-08-02 Mike Sperber <sperber at informatik.uni-tuebingen.de>
@@ -201,7 +268,7 @@
* Makefile.dired (DIFFMODEDIR): Introduce.
* dired.el (dired-recursive-delete-directory): Make the
- directory-and-no-symlink test more efficient.
+ directory-and-no-symlink test more efficient.
2001-05-30 Gregory Neil Shapiro <gshapiro at gshapiro.net>
@@ -258,21 +325,21 @@
1999-04-11 Masatake YAMATO <masata-y at is.aist-nara.ac.jp>
* dired.el (dired-insert-headerline): Insert text properties.
-
- * dired-xemacs.el (dired-insert-set-headerline-properties):
- (dired-get-headerline):
- (dired-insert-set-headerline-properties-internal):
- (dired-split-headerline):
- (dired-headerline-dired):
- (dired-headerline-dired-other-window):
- (dired-headerline-dired-other-frame):
- (dired-headerline-dired-internal):
+
+ * dired-xemacs.el (dired-insert-set-headerline-properties):
+ (dired-get-headerline):
+ (dired-insert-set-headerline-properties-internal):
+ (dired-split-headerline):
+ (dired-headerline-dired):
+ (dired-headerline-dired-other-window):
+ (dired-headerline-dired-other-frame):
+ (dired-headerline-dired-internal):
(dired-headerline-dired-by-key):
- (dired-headerline-dired-other-window-by-key):
- (dired-headerline-dired-other-frame-by-key):
+ (dired-headerline-dired-other-window-by-key):
+ (dired-headerline-dired-other-frame-by-key):
(dired-headerline-dired-by-key-internal): New functions.
(dired-headerline-local-map): New key map.
-
+
* dired-faces.el (dired-face-header): New face.
1999-03-15 Ben North <north at robots.ox.ac.uk>
@@ -311,7 +378,7 @@
1998-04-08 Greg Klanderman <greg at alphatech.com>
* dired.el (dired-pop-to-buffer): respect the user's setting of
- temp-buffer-show-function.
+ temp-buffer-show-function.
2001-03-09 Michael Sperber [Mr. Preprocessor] <sperber at informatik.uni-tuebingen.de>
@@ -325,16 +392,16 @@
2001-03-02 Michael Sperber [Mr. Preprocessor] <sperber at informatik.uni-tuebingen.de>
- * dired.el:
- * dired-cmpr.el:
- * dired-diff.el:
- * dired-grep.el:
- * dired-mob.el:
- * dired-rgxp.el:
- * dired-sex.el:
- * dired-shell.el:
- * dired-uu.el:
- * dired-vir.el:
+ * dired.el:
+ * dired-cmpr.el:
+ * dired-diff.el:
+ * dired-grep.el:
+ * dired-mob.el:
+ * dired-rgxp.el:
+ * dired-sex.el:
+ * dired-shell.el:
+ * dired-uu.el:
+ * dired-vir.el:
* dired-xy.el: Added auto-autoload declarations.
2000-09-21 Michael Sperber [Mr. Preprocessor] <sperber at informatik.uni-tuebingen.de>
1.27 +2 -2 XEmacs/packages/xemacs-packages/dired/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Makefile 2005/04/09 20:24:55 1.26
+++ Makefile 2007/11/11 15:41:17 1.27
@@ -20,8 +20,8 @@
include Makefile.dired
VERSION = 1.17
-AUTHOR_VERSION = 7.13
-MAINTAINER = Mike Sperber <sperber at informatik.uni-tuebingen.de>
+AUTHOR_VERSION = 7.14
+MAINTAINER = Mike Sperber <sperber at deinprogramm.de>
PACKAGE = dired
PKG_TYPE = regular
REQUIRES = xemacs-base prog-modes
1.9 +2 -2 XEmacs/packages/xemacs-packages/dired/Makefile.dired
Index: Makefile.dired
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/Makefile.dired,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Makefile.dired 2005/04/09 14:26:23 1.8
+++ Makefile.dired 2007/11/11 15:41:17 1.9
@@ -2,8 +2,8 @@
#
# File: Makefile
# Release: $EFS release: 1.21 $
-# Release: $dired release: 7.13 $
-# Version: $Revision: 1.8 $
+# Release: $dired release: 7.14 $
+# Version: $Revision: 1.9 $
# RCS:
# Description: Makefile for byte-compiling dired (primarily) and EFS.
# Author: Andy Norman, HPLabs, Bristol, UK.
1.7 +3 -3 XEmacs/packages/xemacs-packages/dired/README
Index: README
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- README 2005/04/09 14:26:23 1.6
+++ README 2007/11/11 15:41:17 1.7
@@ -1,4 +1,4 @@
-This is Dired 7.13
+This is Dired 7.14
==================
Dired is a special mode for editing directory trees, both local and
@@ -15,6 +15,6 @@ maintained via the same mailing lists.
description of mailing lists relevant to Dired. We encourage users to
join these lists.
-NOTE: If you're using Dired 7.13 in conjunction with EFS, you are
- advised to use EFS 1.21 or higher.
+NOTE: If you're using Dired 7.14 in conjunction with EFS, you are
+ advised to use EFS 1.24 or higher.
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-cmpr.el
Index: dired-cmpr.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-cmpr.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-cmpr.el 2005/04/09 14:26:24 1.5
+++ dired-cmpr.el 2007/11/11 15:41:17 1.6
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-cmpr.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Commands for compressing marked files.
;;
1.7 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-diff.el
Index: dired-diff.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-diff.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dired-diff.el 2005/04/09 14:26:24 1.6
+++ dired-diff.el 2007/11/11 15:41:18 1.7
@@ -3,7 +3,7 @@
;;
;; File: dired-diff.el
;; RCS:
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; Description: Support for diff and related commands.
;; Author: Sandy Rutherford <sandy at ibm550.sissa.it>
;; Created: Fri Jun 24 08:50:20 1994 by sandy on ibm550
1.7 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-faces.el
Index: dired-faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-faces.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dired-faces.el 2005/04/09 14:26:24 1.6
+++ dired-faces.el 2007/11/11 15:41:18 1.7
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-faces.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: rudimentary face customization support for dired
;; Author: Mike Sperber <sperber at informatik.uni-tuebingen.de>
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-grep.el
Index: dired-grep.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-grep.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-grep.el 2005/04/09 14:26:24 1.5
+++ dired-grep.el 2007/11/11 15:41:18 1.6
@@ -3,7 +3,7 @@
;;
;; File: dired-grep.el
;; RCS:
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; Description: Support for running grep on marked files in a dired buffer.
;; Author: Sandy Rutherford <sandy at ibm550.sissa.it>
;; Created: Tue Jul 13 22:59:37 1993 by sandy on ibm550
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-help.el
Index: dired-help.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-help.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-help.el 2005/04/09 14:26:24 1.5
+++ dired-help.el 2007/11/11 15:41:18 1.6
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-help.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Obtaining help for dired
;; Modified: Sun Nov 20 21:10:47 1994 by sandy on gandalf
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-mob.el
Index: dired-mob.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-mob.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-mob.el 2005/04/09 14:26:24 1.5
+++ dired-mob.el 2007/11/11 15:41:18 1.6
@@ -2,7 +2,7 @@
;;
;; File: dired-mob.el
;; RCS:
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; Description: Commands for marking files from another buffer.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-mule.el
Index: dired-mule.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-mule.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-mule.el 2005/04/09 14:26:24 1.5
+++ dired-mule.el 2007/11/11 15:41:18 1.6
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-mule.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: MULE support for dired.
;; Created: Sun Jul 17 14:45:12 1994 by sandy on ibm550
1.7 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-oas.el
Index: dired-oas.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-oas.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dired-oas.el 2005/04/09 14:26:24 1.6
+++ dired-oas.el 2007/11/11 15:41:18 1.7
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-oas.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: dired odds and sods. Dired functions not usually needed.
;; This file is not a reference to the Organization of
1.6 +2 -2 XEmacs/packages/xemacs-packages/dired/dired-rgxp.el
Index: dired-rgxp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-rgxp.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-rgxp.el 2005/04/09 14:26:24 1.5
+++ dired-rgxp.el 2007/11/11 15:41:18 1.6
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-rgxp.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Commands for running commands on files whose names
;; match a regular expression.
@@ -89,7 +89,7 @@ Type SPC or `y' to %s one match, DEL or
(newname
(read-string
(concat (if whole-path "Path " "") operation " " regexp " to: ")
- (and (not whole-path) (dired-dwim-target-directory)))))
+ (and (not whole-path) (regexp-quote (dired-dwim-target-directory))))))
(list regexp newname arg whole-path)))
;;; Marking file names matching a regexp.
1.8 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-sex.el
Index: dired-sex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-sex.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-sex.el 2005/04/09 14:26:24 1.7
+++ dired-sex.el 2007/11/11 15:41:18 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-sex.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Marking files according to sexpressions. Sorry.
;; Created: Wed Sep 14 01:30:43 1994 by sandy on ibm550
1.8 +13 -11 XEmacs/packages/xemacs-packages/dired/dired-shell.el
Index: dired-shell.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-shell.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-shell.el 2005/04/09 14:26:24 1.7
+++ dired-shell.el 2007/11/11 15:41:18 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-shell.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Commands for running shell commands on marked files.
;;
@@ -193,16 +193,18 @@ If nil, such files are not marked.")
;;; Utility functions and Macros
(defun dired-shell-quote (filename)
- ;; Quote a file name for inferior shell (see variable shell-file-name).
- ;; Quote everything except POSIX filename characters.
- ;; This should be safe enough even for really weird shells.
- (let ((result "") (start 0) end)
- (while (string-match "[^---0-9a-zA-Z_./]" filename start)
- (setq end (match-beginning 0)
- result (concat result (substring filename start end)
- "\\" (substring filename end (1+ end)))
- start (1+ end)))
- (concat result (substring filename start))))
+ (if (fboundp 'shell-quote-argument)
+ (shell-quote-argument filename)
+ ;; Quote a file name for inferior shell (see variable shell-file-name).
+ ;; Quote everything except POSIX filename characters.
+ ;; This should be safe enough even for really weird shells.
+ (let ((result "") (start 0) end)
+ (while (string-match "[^---0-9a-zA-Z_.+/]" filename start)
+ (setq end (match-beginning 0)
+ result (concat result (substring filename start end)
+ "\\" (substring filename end (1+ end)))
+ start (1+ end)))
+ (concat result (substring filename start)))))
(defun dired-uniquefy-list (list)
;; Returns list, after removing 2nd and higher occurrences
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-uu.el
Index: dired-uu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-uu.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-uu.el 2005/04/09 14:26:25 1.5
+++ dired-uu.el 2007/11/11 15:41:18 1.6
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-uu.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Commands for uuencoding/uudecoding marked files.
;; Author: Sandy Rutherford <sandy at math.ubc.ca>
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-vir.el
Index: dired-vir.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-vir.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-vir.el 2005/04/09 14:26:25 1.5
+++ dired-vir.el 2007/11/11 15:41:18 1.6
@@ -2,7 +2,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-vir.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Virtual dired mode for browsing ls -lR listings.
;; Author: Sebastian Kremer <sk at thp.uni-koeln.de>
1.8 +6 -4 XEmacs/packages/xemacs-packages/dired/dired-xemacs.el
Index: dired-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-xemacs.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-xemacs.el 2005/04/09 14:26:25 1.7
+++ dired-xemacs.el 2007/11/11 15:41:19 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-xemacs.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: dired functions for XEmacs
;; Author: Mike Sperber <sperber at informatik.uni-tuebingen.de>
@@ -286,8 +286,10 @@ This shouldn't match socket or symbolic
(menu (symbol-value (cdr pair))))
(add-submenu nil (cons name menu)))))
dired-menubar-menus))
- (add-menu-button '("Help") (list "---"))
- (add-submenu '("Help") (cons "Dired" dired-help-menu)))))
+ (unless
+ (car (find-menu-item current-menubar '("Help" "Dired")))
+ (add-menu-button '("Help") "--:shadowEtchedIn")
+ (add-submenu '("Help") (cons "Dired" dired-help-menu))))))
(add-hook 'dired-mode-hook 'dired-install-menubar)
@@ -488,7 +490,7 @@ START and END say where."
(defun dired-set-text-properties (start end &optional face)
(let ((extent
- (let ((extents (extent-list nil start end nil 'dired-file-name)))
+ (let ((extents (dired-filename-extents start end)))
(if extents
(car extents)
(let ((extent (make-extent start end)))
1.6 +1 -1 XEmacs/packages/xemacs-packages/dired/dired-xy.el
Index: dired-xy.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired-xy.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dired-xy.el 2005/04/09 14:26:25 1.5
+++ dired-xy.el 2007/11/11 15:41:19 1.6
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-xy.el
-;; Dired Version: 7.13
+;; Dired Version: 7.14
;; RCS:
;; Description: Commands for reading mail from dired.
;;
1.9 +131 -97 XEmacs/packages/xemacs-packages/dired/dired.el
Index: dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/dired.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dired.el 2005/04/09 14:26:25 1.8
+++ dired.el 2007/11/11 15:41:19 1.9
@@ -4,8 +4,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired.el
-;; RCS:
-;; Dired Version: 7.13
+;; RCS:
+;; Dired Version: 7.14
;; Description: The DIRectory EDitor is for manipulating, and running
;; commands on files in a directory.
;; Authors: FSF,
@@ -37,11 +37,11 @@
;;; Dired Version
-(defconst dired-version (substring "#Revision: 7.13 $" 11 -2)
+(defconst dired-version (substring "#Revision: 7.14 $" 11 -2)
"The revision number of Tree Dired (as a string).
Don't forget to mention this when reporting bugs to:
-
+
elisp-code-dired at nongnu.org")
;; Global key bindings:
@@ -57,7 +57,7 @@ Don't forget to mention this when report
;; (define-key ctl-x-4-map "d" 'dired-other-window)
;; (define-key ctl-x-map "\C-j" 'dired-jump-back)
;; (define-key ctl-x-4-map "\C-j" 'dired-jump-back-other-window)
-;;
+;;
;; For V19 emacs only. (Make sure that the ctl-x-5-map exists.)
;; (define-key ctl-x-5-map "d" 'dired-other-frame)
;; (define-key Ctl-x-5-map "\C-j" 'dired-jump-back-other-frame)
@@ -161,13 +161,13 @@ To change this variable use \\[dired-do-
(pack ".z" ("pack" "-f") ("unpack"))
(compact ".C" ("compact") ("uncompact"))
(bzip2 ".bz2" ("bzip2") ("bunzip2") "-f"))
-
+
"*Association list of compression method descriptions.
Each element of the table should be a list of the form
-
+
\(compress-type extension (compress-args) (decompress-args) force-flag\)
-
- where
+
+ where
`compress-type' is a unique symbol in the alist to which
`dired-compression-method' can be set;
`extension' is the file extension (as a string) used by files compressed
@@ -178,16 +178,16 @@ To change this variable use \\[dired-do-
program and flags to pass as separate arguments.
`force-flag' is the switch to pass to the command to force overwriting
of existing files.
-
+
For example:
-
+
\(setq dired-compression-method-alist
\(cons '\(frobnicate \".frob\" \(\"frob\"\) \(\"frob\" \"-d\"\) \"-f\"\)
dired-compression-method-alist\)\)
- => \(\(frobnicate \".frob\" \(\"frob\"\) \(\"frob\" \"-d\"\)\)
+ => \(\(frobnicate \".frob\" \(\"frob\"\) \(\"frob\" \"-d\"\)\)
\(gzip \".gz\" \(\"gzip\"\) \(\"gunzip\"\)\)
...\)
-
+
See also: dired-compression-method <V>")
;;; Variables for the ls program.
@@ -206,6 +206,17 @@ Can contain even `F', `b', `i' and `s'."
(repeat string))
:group 'dired-programs)
+;;;###autolaod
+(defcustom dired-ls-locale nil
+ "*Locale to use when running `dired-ls-program'.
+If non-nil, Dired will set the environment variable LC_ALL
+to this value. Setting it to \"POSIX\" may avoid problems Dired
+has with parsing non-English locales."
+:type '(choice (const nil)
+ (const "POSIX")
+ string)
+:group 'dired-programs)
+
;;;###autoload
(defcustom dired-use-ls-dired
(and (string-match "gnu" system-configuration)
@@ -231,12 +242,12 @@ Can contain even `F', `b', `i' and `s'."
Set this to t if `dired-ls-program' with -lF marks the name of the symbolic
link itself with a trailing @.
-For example: If foo is a link pointing to bar, and \"ls -F bar\" gives
+For example: If foo is a link pointing to bar, and \"ls -F bar\" gives
... bar -> foo
set this variable to nil. If it gives
-
+
... bar@ -> foo
set this variable to t.
@@ -437,7 +448,7 @@ It can be a sublist of
The meanings of most of the symbols are obvious. A few exceptions:
- 'compress applies to compression or decompression by any of the
+ 'compress applies to compression or decompression by any of the
compression program in `dired-compression-method-alist'.
'kill-dired-buffer applies to offering to kill dired buffers for
@@ -452,7 +463,7 @@ The meanings of most of the symbols are
'create-top-dir applies to `dired-up-directory' creating a new top level
directory for the dired buffer.
- 'revert-subdirs applies to re-reading subdirectories which have
+ 'revert-subdirs applies to re-reading subdirectories which have
been modified on disk.
Note that this list also applies to remote files accessed with efs
@@ -467,7 +478,7 @@ or ange-ftp."
(const patch)
(const create-top-dir) (const revert-subdirs))
:group 'dired-behavior)
-
+
;;;###autoload
(defcustom dired-backup-if-overwrite nil
"*Non-nil if Dired should ask about making backups before overwriting files.
@@ -534,7 +545,9 @@ A value of t means move to first file."
(cons "completion-ignored-extensions" completion-ignored-extensions))
"*Alist of extensions for temporary files created by various programs.
Used by `dired-cleanup'."
-:type '(list (cons string (list string)))
+:type '(repeat (list (string :tag "program")
+ (repeat :tag "extensions" :inline t
+ string)))
:group 'dired-file-names)
(defcustom dired-omit-extensions
@@ -552,7 +565,7 @@ Used by `dired-cleanup'."
This only has effect when the subdirectory is in omission mode.
To make omission mode the default, set `dired-omit-files' to t.
See also `dired-omit-regexps'."
-:type '(list string)
+:type '(repeat string)
:group 'dired-file-names)
(make-variable-buffer-local 'dired-omit-extensions)
@@ -562,7 +575,7 @@ This only has effect when the subdirecto
To make omission mode the default, set `dired-omit-files' to t.
This only has effect when `dired-omit-files' is t.
See also `dired-omit-extensions'."
-:type '(list string)
+:type '(repeat regexp)
:group 'dired-file-names)
(make-variable-buffer-local 'dired-omit-regexps)
@@ -717,7 +730,7 @@ The order of elements is the reverse of
"Alist of directories and their associated dired buffers.")
(defvar dired-sort-mode nil
- "Whether Dired sorts by name, date, etc.
+ "Whether Dired sorts by name, date, etc.
\(buffer-local\)")
;; This is nil outside dired buffers so it can be used in the modeline
(make-variable-buffer-local 'dired-sort-mode)
@@ -799,32 +812,39 @@ The order of elements is the reverse of
(defvar dired-re-dot "^.* \\.\\.?/?$") ; with -F, might end in `/'
;; . and .. files
+;; From FSF files.el. Extracted from directory-listing-before-filename-regexp.
(defconst dired-re-month-and-time
(let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
+ (l-or-quote "\\([A-Za-z']\\|[^\0-\177]\\)")
;; In some locales, month abbreviations are as short as 2 letters,
- ;; and they can be padded on the right with spaces.
- ;; weiand: changed: month ends potentially with . or , or .,
- ;;old (month (concat l l "+ *"))
- (month (concat l l "+[.]?,? *"))
- (date "[ 0-3][0-9]\\.?")
- (time "[ 012][0-9]:[0-6][0-9]")
- (year (concat
- "\\("
- ;; year on IRIX, NeXT, SunOS, ULTRIX, Apollo, HP-UX, A/UX
- " ?[12][90][0-9][0-9] ?"
- "\\|"
- ;; year on AIX
- "[12][90][0-9][0-9] "
- "\\)"))
- (month-date (concat "\\(" month " " date "\\)"))
- (date-month (concat "\\(" date " " month "\\)"))
- (iso-date "\\([0-9]+-[0-9]+-[0-9]+\\)"))
- (concat " "
- "\\(" date-month "\\|" month-date "\\|" iso-date "\\)"
- " "
- "\\(" time "\\|" year "\\)"
- " "))
- "Regular expression matching from the date to the filename.
+ ;; and they can be followed by ".".
+ ;; In Breton, a month name can include a quote character.
+ (month (concat l-or-quote l-or-quote "+\\.?"))
+ (s " ")
+ (yyyy "[0-9][0-9][0-9][0-9]")
+ (dd "[ 0-3][0-9]")
+ (HH:MM "[ 0-2][0-9][:.][0-5][0-9]")
+ (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
+ (zone "[-+][0-2][0-9][0-5][0-9]")
+ (iso-mm-dd "[01][0-9]-[0-3][0-9]")
+ (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
+ (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
+ "\\|" yyyy "-" iso-mm-dd "\\)"))
+ (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
+ s "+"
+ "\\(" HH:MM "\\|" yyyy "\\)"))
+ (western-comma (concat month s "+" dd "," s "+" yyyy))
+ ;; Japanese MS-Windows ls-lisp has one-digit months, and
+ ;; omits the Kanji characters after month and day-of-month.
+ ;; On Mac OS X 10.3, the date format in East Asian locales is
+ ;; day-of-month digits followed by month digits.
+ (mm "[ 0-1]?[0-9]")
+ (east-asian
+ (concat "\\(" mm l "?" s dd l "?" s "+"
+ "\\|" dd s mm s "+" "\\)"
+ "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
+ (concat "\\(" western "\\|" western-comma "\\|" east-asian "\\|" iso "\\)" s "+"))
+ "Regular expression matching from the date to the filename.
This regexp MUST match all the way to first character of the filename.")
(defvar dired-subdir-regexp
@@ -881,7 +901,7 @@ This regexp MUST match all the way to fi
;;;;------------------------------------------------------------------
;;;; Utilities
-;;;;------------------------------------------------------------------
+;;;;------------------------------------------------------------------
;;; Macros
;;
@@ -1864,7 +1884,7 @@ See variable `dired-local-variables-file
(if (dired-in-this-tree (car x) dirname)
(dired-insert-subdir x))))
other-dirs)))))
-
+
;;; Subroutines of dired-readin
(defun dired-readin-insert (dir-or-list &optional wildcard)
@@ -1902,14 +1922,23 @@ See variable `dired-local-variables-file
(mapcar
(function
(lambda (x)
- (insert-directory x switches wildcard)))
+ (dired-call-insert-directory x switches wildcard)))
(cdr dir-or-list))
- (insert-directory dir-or-list switches wildcard full-p))
+ (dired-call-insert-directory dir-or-list switches wildcard full-p))
(setq end (point-marker))
(dired-indent-listing opoint end)
(dired-insert-set-properties opoint end))
(setq dired-directory dir-or-list))
+(defun dired-call-insert-directory (&rest args)
+ "Call `insert-directory' in the correct process environment."
+ (let ((process-environment
+ (if dired-ls-locale
+ (cons (concat "LC_ALL=" dired-ls-locale)
+ process-environment)
+ process-environment)))
+ (apply 'insert-directory args)))
+
(defun dired-frob-dir-list (dir-list)
(let* ((top (file-name-as-directory (expand-file-name (car dir-list))))
(tail (cdr dir-list))
@@ -1935,8 +1964,8 @@ See variable `dired-local-variables-file
;; boundaries.
(if (fboundp 'dired-insert-set-headerline-properties)
;; code activate `headerline popup menu'
- (save-excursion (prog1
- (save-excursion
+ (save-excursion (prog1
+ (save-excursion
(insert " " (directory-file-name dir) ":\n"))
(dired-insert-set-headerline-properties)
))
@@ -2217,7 +2246,7 @@ With a prefix prompts for listing switch
(defun dired-maybe-insert-subdir (dirname &optional
switches no-error-if-not-dir-p)
"Insert this subdirectory into the same dired buffer.
-If it is already present, just move to it (type \\[dired-do-redisplay] to
+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
@@ -2366,9 +2395,9 @@ Non-directories are silently ignored."
(mapcar
(function
(lambda (x)
- (insert-directory x switches t)))
+ (dired-call-insert-directory x switches t)))
(cdr dir-or-list)))
- (insert-directory dirname switches nil t))
+ (dired-call-insert-directory dirname switches nil t))
(setq end (point-marker))
(dired-indent-listing begin end)
(dired-insert-set-properties begin end)))
@@ -2417,7 +2446,7 @@ Non-directories are silently ignored."
;;;; --------------------------------------------------------------
;;;; Dired motion commands -- moving around in the dired buffer.
;;;; --------------------------------------------------------------
-
+
(defun dired-next-line (arg)
"Move down lines then position at filename.
Optional prefix ARG says how many lines to move; default is one line."
@@ -2744,10 +2773,10 @@ Returns position (point) or nil if no fi
;; This is the UNIX version.
;; have to be careful that we don't move to omitted files
(let (case-fold-search)
-
+
(or eol (setq eol (save-excursion (skip-chars-forward "^\r\n") (point))))
(or bol (setq bol (progn (skip-chars-backward "^\r\n") (point))))
-
+
(let ((maybe (dired-maybe-filename-start bol eol)))
(cond
(maybe (goto-char maybe))
@@ -2833,7 +2862,7 @@ Returns position (point) or nil if no fi
;; else not a symbolic link
(goto-char eol)
;; ls -lF marks dirs, sockets and executables with exactly
- ;; one trailing character. -F may not actually be honored,
+ ;; one trailing character. -F may not actually be honored,
;; e.g. by an FTP ls in efs
(and
(memq ?F dired-internal-switches)
@@ -2856,7 +2885,7 @@ Returns position (point) or nil if no fi
(point)))
(and (null no-error)
(error "No file on this line"))))
-
+
;; A brief listing
((eq (point) eol)
(and (null no-error)
@@ -3750,6 +3779,7 @@ with a prefix argument."
(let* ((base-versions
(concat (file-name-nondirectory fn) ".~"))
(bv-length (length base-versions))
+ (backup-extract-version-start (length base-versions))
(possibilities (file-name-all-completions
base-versions
(file-name-directory fn))))
@@ -3769,6 +3799,7 @@ with a prefix argument."
(and (not (string-equal base fn))
(setq base-version-list (assoc base alist))
(setq bv-length (string-match "[0-9]" fn (length base)))
+ (setq backup-extract-version-start (string-match "[0-9]" fn (length base)))
(not (memq (backup-extract-version fn) base-version-list))
(progn (skip-chars-backward "^\n\r")
(bolp)) ; make sure the preceding char isn't \r.
@@ -3911,7 +3942,7 @@ with a prefix argument."
(if across (setq list (cdr list))))
(setcar widths (- (car widths) 2))
(nreverse widths)))))
-
+
(defun dired-calculate-columns (list &optional across)
;; Returns a list of integers which are the column widths that best pack
;; LIST, a list of strings, onto the screen.
@@ -4457,7 +4488,7 @@ With prefix argument, unflag all those f
(let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
(dired-mark-if (looking-at dired-re-exe) "executable file"))))
(dired-update-mode-line-modified t))
-
+
(defun dired-flag-backup-files (&optional unflag-p)
"Flag all backup files (names ending with `~') for deletion.
With prefix argument, unflag these files."
@@ -4636,11 +4667,11 @@ Thus, use \\[backward-page] to find the
With a 0 prefix argument, simply reports on the current switches.
-With a prefix 1 allows the ls switches for the current subdirectory to be
+With a prefix 1 allows the ls switches for the current subdirectory to be
edited.
With a prefix 2 allows the default ls switches for newly inserted
-subdirectories to be edited.
+subdirectories to be edited.
With a prefix \\[universal-argument] allows you to sort the entire
buffer by either name or date.
@@ -4649,7 +4680,7 @@ With a prefix \\[universal-argument] \\[
for the entire buffer to be edited, and then reverts the buffer so that all
subdirectories are sorted according to these switches.
-Note that although dired allows different ls switches to be used for
+Note that although dired allows different ls switches to be used for
different subdirectories, certain combinations of ls switches are incompatible.
If incompatible switches are detected, dired will offer to revert the buffer
to force the ls switches for all subdirectories to a single value. If you
@@ -4770,7 +4801,7 @@ refuse to revert the buffer, any change
(setq dired-internal-switches switches))
(or no-revert
(cond
-
+
(subdir
(let ((ofile (dired-get-filename nil t))
(opoint (point)))
@@ -4778,7 +4809,7 @@ refuse to revert the buffer, any change
(dired-insert-subdir subdir switches)
(message "Relisting %s... done" subdir)
(or (and ofile (dired-goto-file ofile)) (goto-char opoint))))
-
+
((memq ?R switches)
;; We are replacing a buffer with a giant recursive listing.
(let ((opoint (point))
@@ -4813,7 +4844,7 @@ refuse to revert the buffer, any change
(or (and ofile (dired-goto-file ofile))
(goto-char opoint))
(dired-move-to-filename)))
-
+
(t
;; Clear all switches in the subdir alist
(setq dired-subdir-alist
@@ -4864,7 +4895,7 @@ refuse to revert the buffer, any change
;; Create a new file for each from a list of existing files. The user
;; is queried, dired buffers are updated, and at the end a success or
;; failure message is displayed
-
+
;; FILE-CREATOR must accept three args: oldfile newfile ok-if-already-exists
;; It is called for each file and must create newfile, the entry of
;; which will be added. The user will be queried if the file already
@@ -4872,12 +4903,12 @@ refuse to revert the buffer, any change
;; rename), it is FILE-CREATOR's responsibility to update dired
;; buffers. FILE-CREATOR must abort by signalling a file-error if it
;; could not create newfile. The error is caught and logged.
-
+
;; OPERATION (a capitalized string, e.g. `Copy') describes the
;; operation performed. It is used for error logging.
-
+
;; FN-LIST is the list of files to copy (full absolute pathnames).
-
+
;; NAME-CONSTRUCTOR returns a newfile for every oldfile, or nil to
;; skip. If it skips files, it is supposed to tell why (using dired-log).
@@ -4918,7 +4949,7 @@ refuse to revert the buffer, any change
;; Don't let jka-compr fool us.
(file-exists-p to)))
;; for dired-handle-overwrite
- (dired-overwrite-confirmed
+ (dired-overwrite-confirmed
(and overwrite
(let ((help-form '(format "\
Type SPC or `y' to overwrite file `%s',
@@ -4975,7 +5006,7 @@ ESC or `q' to not overwrite any of the r
(t
(message "%s: %s file%s."
operation success-count (dired-plural-s success-count)))))))
-
+
(defun dired-do-create-files (op-symbol file-creator operation arg
&optional marker-char
prompter how-to)
@@ -5113,10 +5144,12 @@ variable `dired-copy-preserve-time' (whi
(defun dired-copy-file (from to ok-flag)
(dired-handle-overwrite to)
- (dired-copy-file-recursive from to ok-flag dired-copy-preserve-time t))
+ (dired-copy-file-recursive (function copy-file)
+ from to ok-flag dired-copy-preserve-time t))
-(defun dired-copy-file-recursive (from to ok-flag &optional
- preserve-time top no-confirm-recursive)
+(defun dired-copy-file-recursive (copy-file
+ from to ok-flag &optional
+ preserve-time top no-confirm-recursive)
(if (and (eq t (car (file-attributes from))) ; A directory, no symbolic link.
(or (memq 'recursive-copy dired-no-confirm)
no-confirm-recursive
@@ -5131,12 +5164,13 @@ variable `dired-copy-preserve-time' (whi
(if (not (member (file-name-nondirectory file)
'("." "..")))
(dired-copy-file-recursive
+ copy-file
(expand-file-name file from)
(expand-file-name file to)
ok-flag preserve-time nil t)))
(setq files (cdr files))))
(or top (dired-handle-overwrite to)) ; Just a file.
- (copy-file from to ok-flag preserve-time)))
+ (funcall copy-file from to ok-flag preserve-time)))
;;; Renaming/moving files
@@ -5198,7 +5232,7 @@ A zero ARG moves no files but toggles `d
(setq default-directory to-dir
dired-directory
;; Need to beware of wildcards.
- (expand-file-name
+ (expand-file-name
(file-name-nondirectory dired-directory)
to-dir))
(let ((new-name (file-name-nondirectory
@@ -5310,7 +5344,7 @@ with the same names that the files curre
return
;; Fudge return code by looking for errors in current buffer.
(if (zerop (buffer-size)) 0 1))))
-
+
(defun dired-check-process (msg program &rest arguments)
;; Display MSG while running PROGRAM, and check for output.
;; Remaining arguments are strings passed as command arguments to PROGRAM.
@@ -5440,13 +5474,13 @@ This calls chmod, thus symbolic modes li
(defun dired-copy-filenames-as-kill (&optional arg)
"Copy names of marked (or next ARG) files into the kill ring.
The names are separated by a space, and may be copied into other buffers
-with \\[yank]. The list of names is also stored in the variable
+with \\[yank]. The list of names is also stored in the variable
`dired-marked-files' for possible manipulation in the *scratch* buffer.
With a 0 prefix argument, use the pathname relative to the top-level dired
directory for each marked file.
-With a prefix \\[universal-argument], use the complete pathname of each
+With a prefix \\[universal-argument], use the complete pathname of each
marked file.
With a prefix \\[universal-argument] \\[universal-argument], copy the complete
@@ -5795,7 +5829,7 @@ displayed."
(defun dired-add-omit-regexp (rgxp &optional how)
"Adds a new regular expression to the list of omit regular expresions.
-With a non-zero numeric prefix argument, deletes a regular expresion from
+With a non-zero numeric prefix argument, deletes a regular expresion from
the list.
With a prefix argument \\[universal-argument], adds a new extension to
@@ -5803,7 +5837,7 @@ the list of file name extensions omitted
With a prefix argument \\[universal-argument] \\[universal-argument], deletes
a file name extension from the list.
-With a prefix 0, reports on the current omit regular expressions and
+With a prefix 0, reports on the current omit regular expressions and
extensions."
(interactive
(list
@@ -5918,7 +5952,7 @@ extensions."
"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.
-With the optional argument REALLY, we always hide
+With the optional argument REALLY, we always hide
the subdir, regardless of dired-subdir-hidden-p."
;; The arg REALLY is needed because when we unhide
;; omitted files in a hidden subdir, we want to
@@ -5951,7 +5985,7 @@ the subdir, regardless of dired-subdir-h
(setq end-pos (+ end-pos 3)))
(subst-char-in-region (point) end-pos ?\n ?\r)))
(dired-next-subdir 1 t))))
-
+
(defun dired-hide-all (arg)
"Hide all subdirectories, leaving only their header lines.
If there is already something hidden, make everything visible again.
@@ -6186,20 +6220,20 @@ Use \\[dired-hide-subdir] to (un)hide a
;; Add a new entry for FILENAME, optionally marking it
;; with MARKER-CHAR (a character, else dired-marker-char is used).
;; Hidden subdirs are exposed if a file is added there.
- ;;
+ ;;
;; This function now adds the new entry at the END of the previous line,
;; not the beginning of the current line.
;; Logically, we now think of the `newline' associated
;; with a fileline, as the one at the beginning of the line, not the end.
;; This makes it easier to keep track of omitted files.
- ;;
+ ;;
;; Uses dired-save-excursion, so that it doesn't move the
;; point around. Especially important when it runs asynch.
- ;;
+ ;;
;; If there is already an entry, delete the existing one before adding a
;; new one. In this case, doesn't remember its mark. Use
;; dired-update-file-line for that.
- ;;
+ ;;
;; If INPLACE eq 'relist, then the new entry is put in the
;; same place as the old, if there was an old entry.
;; If INPLACE is t, then the file entry is put on the line
@@ -6257,7 +6291,7 @@ Use \\[dired-hide-subdir] to (un)hide a
(let ((insert-directory-program dired-ls-program))
(if dired-use-ls-dired
(setq switches (concat "--dired " switches)))
- (insert-directory filename switches nil nil))
+ (dired-call-insert-directory filename switches nil nil))
(dired-after-add-entry b-of-l marker-char))
(if dired-verify-modtimes
(dired-set-file-modtime directory dired-subdir-alist))
@@ -6718,7 +6752,7 @@ with the command \\[tags-loop-continue].
(put 'dired-recursive-delete-directory 'dired 'dired-handler-fn-4)
(put 'make-directory-internal 'dired 'dired-handler-fn-5)
(put 'set-file-modes 'dired 'dired-handler-fn-5)
-
+
;;;; --------------------------------------------------------------
;;;; Multi-flavour Emacs support
;;;; --------------------------------------------------------------
@@ -6736,11 +6770,11 @@ with the command \\[tags-loop-continue].
(defun dired-read-with-history (prompt initial history)
(read-from-minibuffer prompt initial nil nil history))
-
+
(defun dired-read-with-history (prompt initial history)
(let ((minibuffer-history-symbol history)) ; for gmhist
(read-string prompt initial))))
-
+
;; Completing read with history.
(if (>= ver 19)
@@ -6751,7 +6785,7 @@ with the command \\[tags-loop-continue].
(let ((minibuffer-history-symbol history)) ; for gmhist
(completing-read prompt table predicate require-match
initial-input))))
-
+
;; Abbreviating file names.
(if lucid-p
(fset 'dired-abbreviate-file-name
@@ -6766,14 +6800,14 @@ with the command \\[tags-loop-continue].
(if lucid-p
(or (fboundp 'delete-directory)
(fset 'delete-directory 'remove-directory)))
-
+
;; Minibuffers
(if (= ver 18)
-
+
(defun dired-get-active-minibuffer-window ()
(and (> (minibuffer-depth) 0)
(minibuffer-window)))
-
+
(defun dired-get-active-minibuffer-window ()
(let ((frames (frame-list))
win found)
More information about the XEmacs-CVS
mailing list