;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp
-;; Copyright (C) 1992, 1994 by Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Copyright (C) 1992, 1994 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Maintainer: FSF
;; Keywords: unix
;; This file is part of GNU Emacs.
\f
;;; Code:
+;;;###autoload
(defvar ls-lisp-support-shell-wildcards t
"*Non-nil means file patterns are treated as shell wildcards.
nil means they are treated as Emacs regexps (for backward compatibility).
This variable is checked by \\[insert-directory] only when `ls-lisp.el'
package is used.")
-(defun insert-directory (file &optional switches wildcard full-directory-p)
+(defvar ls-lisp-dired-ignore-case nil
+ "Non-nil causes dired buffers to sort alphabetically regardless of case.")
+
+(defvar ls-lisp-use-insert-directory-program nil
+ "Non-nil causes ls-lisp to revert back to using `insert-directory-program'.
+This is useful on platforms where ls-lisp is dumped into Emacs, such as
+Microsoft Windows, but you would still like to use a program to list
+the contents of a directory.")
+
+;; Remember the original insert-directory function.
+(fset 'original-insert-directory (symbol-function 'insert-directory))
+
+(defun insert-directory (file switches &optional wildcard full-directory-p)
+ "Insert directory listing for FILE, formatted according to SWITCHES.
+Leaves point after the inserted text.
+SWITCHES may be a string of options, or a list of strings.
+Optional third arg WILDCARD means treat FILE as shell wildcard.
+Optional fourth arg FULL-DIRECTORY-P means file is a directory and
+switches do not contain `d', so that a full listing is expected.
+
+This version of the function comes from `ls-lisp.el'. Depending upon
+the value of `ls-lisp-use-insert-directory-program', it will use an
+external program if non-nil or the lisp function `ls-lisp-insert-directory'
+otherwise."
+ (if ls-lisp-use-insert-directory-program
+ (original-insert-directory file switches wildcard full-directory-p)
+ (ls-lisp-insert-directory file switches wildcard full-directory-p)))
+
+(defun ls-lisp-insert-directory (file switches &optional wildcard full-directory-p)
"Insert directory listing for FILE, formatted according to SWITCHES.
Leaves point after the inserted text.
Optional third arg WILDCARD means treat FILE as shell wildcard.
Optional fourth arg FULL-DIRECTORY-P means file is a directory and
switches do not contain `d', so that a full listing is expected.
-This version of the function comes from `ls-lisp.el'. It doesn not
+This version of the function comes from `ls-lisp.el'. It does not
run any external programs or shells. It supports ordinary shell
wildcards if `ls-lisp-support-shell-wildcards' variable is non-nil;
otherwise, it interprets wildcards as regular expressions to match
short
(file-list (directory-files dir nil wildcard))
file-alist
+ (now (current-time))
;; do all bindings here for speed
fil attr)
(cond ((memq ?A switches)
attr (cdr elt))
(and attr
(setq sum (+ sum (nth 7 attr)))
- (insert (ls-lisp-format short attr switches))))
+ (insert (ls-lisp-format short attr switches now))))
;; Fill in total size of all files:
(save-excursion
(search-backward "total \007")
;; file-attributes will not recognize a symlink to a directory
;; must make it a relative filename as ls does:
(setq file (file-name-nondirectory file))
- (insert (ls-lisp-format file (file-attributes file) switches))))))
+ (insert (ls-lisp-format file (file-attributes file) switches
+ (current-time)))))))
(defun ls-lisp-delete-matching (regexp list)
;; Delete all elements matching REGEXP from LIST, return new list.
(ls-lisp-time-lessp (nth index (cdr y))
(nth index (cdr x))))))
(t ; sorted alphabetically
- (function
- (lambda (x y)
- (string-lessp (car x)
- (car y)))))))))
+ (if ls-lisp-dired-ignore-case
+ (function
+ (lambda (x y)
+ (string-lessp (upcase (car x))
+ (upcase (car y)))))
+ (function
+ (lambda (x y)
+ (string-lessp (car x)
+ (car y))))))))))
(if (memq ?r switches) ; reverse sort order
(setq file-alist (nreverse file-alist)))
file-alist)
(< lo0 lo1)))))
-(defun ls-lisp-format (file-name file-attr &optional switches)
+(defun ls-lisp-format (file-name file-attr switches now)
(let ((file-type (nth 0 file-attr)))
(concat (if (memq ?i switches) ; inode number
(format "%6d " (nth 10 file-attr)))
(int-to-string (nth 3 file-attr))) ; gid
(nth 7 file-attr) ; size in bytes
)
- (ls-lisp-format-time file-attr switches)
+ (ls-lisp-format-time file-attr switches now)
" "
file-name
(if (stringp file-type) ; is a symbolic link
;; default is last modtime
(t 5)))
-(defun ls-lisp-format-time (file-attr switches)
+(defun ls-lisp-format-time (file-attr switches now)
;; Format time string for file with attributes FILE-ATTR according
;; to SWITCHES (a list of ls option letters of which c and u are recognized).
- ;; file-attributes's time is in a braindead format
- ;; Emacs 19 can format it using a new optional argument to
- ;; current-time-string, for Emacs 18 we just return the faked fixed
- ;; date "Jan 00 00:00 ".
- (condition-case error-data
- (let* ((time (current-time-string
- (nth (ls-lisp-time-index switches) file-attr)))
- (date (substring time 4 11)) ; "Apr 30 "
- (clock (substring time 11 16)) ; "11:27"
- (year (substring time 19 24)) ; " 1992"
- (same-year (equal year (substring (current-time-string) 19 24))))
- (concat date ; has trailing SPC
- (if same-year
- ;; this is not exactly the same test used by ls
- ;; ls tests if the file is older than 6 months
- ;; but we can't do time differences easily
- clock
- year)))
- (error
- "Jan 00 00:00")))
+ ;; Use the same method as `ls' to decide whether to show time-of-day or year,
+ ;; depending on distance between file date and NOW.
+ (let* ((time (nth (ls-lisp-time-index switches) file-attr))
+ (diff16 (- (car time) (car now)))
+ (diff (+ (ash diff16 16) (- (car (cdr time)) (car (cdr now)))))
+ (past-cutoff (- (* 6 30 24 60 60))) ; 6 30-day months
+ (future-cutoff (* 60 60))) ; 1 hour
+ (format-time-string
+ (if (and
+ (<= past-cutoff diff) (<= diff future-cutoff)
+ ;; Sanity check in case `diff' computation overflowed.
+ (<= (1- (ash past-cutoff -16)) diff16)
+ (<= diff16 (1+ (ash future-cutoff -16))))
+ "%b %e %H:%M"
+ "%b %e %Y")
+ time)))
(provide 'ls-lisp)
HCoop / bpt / emacs.git / blobdiff