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 Jan 13 09:51:23 EST 2008
User: michaels
Date: 08/01/13 15:51: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.16.
Revision Changes Path
1.26 +22 -2 XEmacs/packages/xemacs-packages/dired/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ChangeLog 2007/12/17 21:24:10 1.25
+++ ChangeLog 2008/01/13 14:51:19 1.26
@@ -1,6 +1,26 @@
-2007-12-17 Norbert Koch <viteno at xemacs.org>
+2008-01-13 Mike Sperber <sperber at deinprogramm.de>
- * Makefile (VERSION): XEmacs package 1.18 released.
+ * Dired 7.16.
+
+2008-01-11 Mike Sperber <sperber at deinprogramm.de>
+
+ * dired.el (dired-mule): Also load dired-mule when (featurep
+ 'file-coding).
+
+2008-01-08 Michael Sperber <sperber at deinprogramm.de>
+
+ * dired.el (dired-listing-switches): Note that it can contain `h'.
+ (dired-re-before-filename): Add size suffixes for "ls -h".
+ (dired-get-file-size): Adjust for above changes.
+
+2008-01-08 Michael Sperber <sperber at deinprogramm.de>
+
+ * dired-sex.el (dired-parse-ls): Use.
+ * dired.el (dired-manual-move-to-filename): Use. This avoids a
+ bug with lines like
+ "-rw-r--r-- 1 sperber 21 8730 Jan 7 09:25 foo" where
+ "sperber 21 8730" is recgonized as a date.
+ * dired.el (dired-re-before-filename): Add.
2007-12-17 Michael Sperber <sperber at deinprogramm.de>
1.31 +1 -1 XEmacs/packages/xemacs-packages/dired/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Makefile 2007/12/17 21:24:11 1.30
+++ Makefile 2008/01/13 14:51:19 1.31
@@ -20,7 +20,7 @@
include Makefile.dired
VERSION = 1.18
-AUTHOR_VERSION = 7.15
+AUTHOR_VERSION = 7.16
MAINTAINER = Mike Sperber <sperber at deinprogramm.de>
PACKAGE = dired
PKG_TYPE = regular
1.11 +1 -1 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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- Makefile.dired 2007/12/17 18:34:24 1.10
+++ Makefile.dired 2008/01/13 14:51:19 1.11
@@ -2,8 +2,8 @@
#
# File: Makefile
# Release: $EFS release: 1.21 $
-# Release: $dired release: 7.15 $
-# Version: $Revision: 1.10 $
+# Release: $dired release: 7.16 $
+# Version: $Revision: 1.11 $
# RCS:
# Description: Makefile for byte-compiling dired (primarily) and EFS.
# Author: Andy Norman, HPLabs, Bristol, UK.
1.9 +2 -2 XEmacs/packages/xemacs-packages/dired/README
Index: README
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/dired/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- README 2007/12/17 18:34:24 1.8
+++ README 2008/01/13 14:51:19 1.9
@@ -1,4 +1,4 @@
-This is Dired 7.15
+This is Dired 7.16
==================
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.15 in conjunction with EFS, you are
+NOTE: If you're using Dired 7.16 in conjunction with EFS, you are
advised to use EFS 1.24 or higher.
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-cmpr.el 2007/12/17 18:34:24 1.7
+++ dired-cmpr.el 2008/01/13 14:51:19 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-cmpr.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Commands for compressing marked files.
;;
1.9 +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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dired-diff.el 2007/12/17 18:34:24 1.8
+++ dired-diff.el 2008/01/13 14:51:19 1.9
@@ -3,7 +3,7 @@
;;
;; File: dired-diff.el
;; RCS:
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; 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.9 +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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dired-faces.el 2007/12/17 18:34:24 1.8
+++ dired-faces.el 2008/01/13 14:51:19 1.9
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-faces.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: rudimentary face customization support for dired
;; Author: Mike Sperber <sperber at informatik.uni-tuebingen.de>
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-grep.el 2007/12/17 18:34:24 1.7
+++ dired-grep.el 2008/01/13 14:51:19 1.8
@@ -3,7 +3,7 @@
;;
;; File: dired-grep.el
;; RCS:
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; 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.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-help.el 2007/12/17 18:34:24 1.7
+++ dired-help.el 2008/01/13 14:51:19 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-help.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Obtaining help for dired
;; Modified: Sun Nov 20 21:10:47 1994 by sandy on gandalf
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-mob.el 2007/12/17 18:34:25 1.7
+++ dired-mob.el 2008/01/13 14:51:19 1.8
@@ -2,7 +2,7 @@
;;
;; File: dired-mob.el
;; RCS:
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; Description: Commands for marking files from another buffer.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-mule.el 2007/12/17 18:34:25 1.7
+++ dired-mule.el 2008/01/13 14:51:20 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-mule.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: MULE support for dired.
;; Created: Sun Jul 17 14:45:12 1994 by sandy on ibm550
1.9 +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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dired-oas.el 2007/12/17 18:34:25 1.8
+++ dired-oas.el 2008/01/13 14:51:20 1.9
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-oas.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: dired odds and sods. Dired functions not usually needed.
;; This file is not a reference to the Organization of
1.8 +1 -1 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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-rgxp.el 2007/12/17 18:34:25 1.7
+++ dired-rgxp.el 2008/01/13 14:51:20 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-rgxp.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Commands for running commands on files whose names
;; match a regular expression.
1.10 +3 -3 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dired-sex.el 2007/12/17 18:34:25 1.9
+++ dired-sex.el 2008/01/13 14:51:20 1.10
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-sex.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Marking files according to sexpressions. Sorry.
;; Created: Wed Sep 14 01:30:43 1994 by sandy on ibm550
@@ -26,9 +26,9 @@
;; Moves point within the current line to the end of the file name.
(let ((bol (progn (beginning-of-line) (point)))
(eol (save-excursion (skip-chars-forward "^\n\r") (point))))
- (if (re-search-forward dired-re-month-and-time eol t)
+ (if (re-search-forward dired-re-before-filename eol t)
(let ((mode-len 10) ; length of mode string
- (tstart (progn (goto-char (match-beginning 0))
+ (tstart (progn (goto-char (match-beginning 1))
(skip-chars-forward " ")
(point)))
(fstart (match-end 0))
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dired-shell.el 2007/12/17 18:34:25 1.9
+++ dired-shell.el 2008/01/13 14:51:20 1.10
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-shell.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Commands for running shell commands on marked files.
;;
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-uu.el 2007/12/17 18:34:25 1.7
+++ dired-uu.el 2008/01/13 14:51:20 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-uu.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Commands for uuencoding/uudecoding marked files.
;; Author: Sandy Rutherford <sandy at math.ubc.ca>
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-vir.el 2007/12/17 18:34:25 1.7
+++ dired-vir.el 2008/01/13 14:51:20 1.8
@@ -2,7 +2,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-vir.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Virtual dired mode for browsing ls -lR listings.
;; Author: Sebastian Kremer <sk at thp.uni-koeln.de>
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dired-xemacs.el 2007/12/17 18:34:25 1.9
+++ dired-xemacs.el 2008/01/13 14:51:20 1.10
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-xemacs.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: dired functions for XEmacs
;; Author: Mike Sperber <sperber at informatik.uni-tuebingen.de>
1.8 +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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dired-xy.el 2007/12/17 18:34:25 1.7
+++ dired-xy.el 2008/01/13 14:51:20 1.8
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; File: dired-xy.el
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; RCS:
;; Description: Commands for reading mail from dired.
;;
1.11 +33 -12 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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dired.el 2007/12/17 18:34:26 1.10
+++ dired.el 2008/01/13 14:51:20 1.11
@@ -5,7 +5,7 @@
;;
;; File: dired.el
;; RCS:
-;; Dired Version: 7.15
+;; Dired Version: 7.16
;; Description: The DIRectory EDitor is for manipulating, and running
;; commands on files in a directory.
;; Authors: FSF,
@@ -37,7 +37,7 @@
;;; Dired Version
-(defconst dired-version (substring "#Revision: 7.15 $" 11 -2)
+(defconst dired-version (substring "#Revision: 7.16 $" 11 -2)
"The revision number of Tree Dired (as a string).
Don't forget to mention this when reporting bugs to:
@@ -201,7 +201,7 @@ To change this variable use \\[dired-do-
;;;###autoload
(defcustom dired-listing-switches "-al"
"*Switches passed to ls for dired. MUST contain the `l' option.
-Can contain even `F', `b', `i' and `s'."
+Can contain even `h', `F', `b', `i' and `s'."
:type '(choice string
(repeat string))
:group 'dired-programs)
@@ -847,6 +847,12 @@ The order of elements is the reverse of
"Regular expression matching from the date to the filename.
This regexp MUST match all the way to first character of the filename.")
+(defconst dired-re-before-filename
+ (concat ".*[0-9]+[BkKMGTPEZY]? \\(" dired-re-month-and-time "\\)")
+ "Regular expression matching a portion of a directory line up to the filename.
+This regexp MUST match all the way to first character of the filename.
+The first submatch is the date portion of the filename.")
+
(defvar dired-subdir-regexp
"\\([\n\r]\n\\|\\`\\). \\([^\n\r]+\\)\\(:\\)\\(\\.\\.\\.\r\\|[\n\r]\\)")
;; Regexp matching a maybe hidden subdirectory line in ls -lR output.
@@ -2788,7 +2794,7 @@ Returns position (point) or nil if no fi
; separator, node #, separator, owner,
; separator
(goto-char (+ bol 17))
- (re-search-forward dired-re-month-and-time eol t))
+ (re-search-forward dired-re-before-filename eol t))
(point)
(goto-char bol)
(if raise-error
@@ -5462,14 +5468,29 @@ This calls chmod, thus symbolic modes li
(defun dired-get-file-size ()
;; Returns the file size in bytes of the current file, as an integer.
;; Assumes that it is on a valid file line. It's the caller's responsibility
- ;; to ensure this. Assumes that match 0 for dired-re-month-and-time is
- ;; at the end of the file size.
- (end-of-line)
- (search-backward-regexp dired-re-month-and-time)
+ ;; to ensure this.
+ (beginning-of-line)
+ (re-search-forward dired-re-before-filename)
+ (goto-char (match-beginning 1))
(skip-chars-backward " ")
- (string-to-int (buffer-substring (point)
- (progn (skip-chars-backward "0-9")
- (point)))))
+ (dired-size-spec-to-size
+ (buffer-substring (point)
+ (progn (skip-chars-backward "^ ")
+ (point)))))
+
+(defun dired-size-spec-to-size (size-spec)
+ "Convert a size specification to a size in bytes."
+ (if (string-match "^[0-9]+$" size-spec)
+ (string-to-int size-spec)
+ (let* ((size (length size-spec))
+ (num (string-to-int (substring size-spec 0 (- size 1))))
+ (last ))
+ (* num
+ (expt 1024
+ (or (cdr-safe
+ (assoc (aref size-spec (- size 1))
+ '((?B . 0) (?k . 1) (?K . 1) (?M . 2) (?G . 3) (?T . 4) (?P . 5))))
+ 1)))))) ; probably bogus, but we don't know any better
(defun dired-copy-filenames-as-kill (&optional arg)
"Copy names of marked (or next ARG) files into the kill ring.
@@ -6839,7 +6860,7 @@ with the command \\[tags-loop-continue].
;;; MULE
-(if (or (boundp 'MULE) (featurep 'mule)) (load "dired-mule"))
+(if (or (boundp 'MULE) (featurep 'mule) (featurep 'file-coding)) (load "dired-mule"))
;; Run load hook for user customization.
More information about the XEmacs-CVS
mailing list