2017-07-25 05:53:44 +00:00
|
|
|
|
;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp -*- lexical-binding: t -*-
|
1993-03-17 17:17:05 +00:00
|
|
|
|
|
2020-01-01 00:19:43 +00:00
|
|
|
|
;; Copyright (C) 1992, 1994, 2000-2020 Free Software Foundation, Inc.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
2001-07-15 16:15:35 +00:00
|
|
|
|
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
|
|
|
|
|
;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
|
2019-05-25 20:43:06 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
2001-07-15 16:15:35 +00:00
|
|
|
|
;; Keywords: unix, dired
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
1991-02-02 13:10:10 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1991-02-02 13:10:10 +00:00
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1991-02-02 13:10:10 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1991-02-02 13:10:10 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
1991-02-02 13:10:10 +00:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; OVERVIEW ==========================================================
|
1992-04-30 10:37:15 +00:00
|
|
|
|
|
2013-09-17 07:43:14 +00:00
|
|
|
|
;; This file advises the function `insert-directory' to implement it
|
|
|
|
|
;; directly from Emacs lisp, without running ls in a subprocess.
|
|
|
|
|
;; This is useful if you don't have ls installed (ie, on MS Windows).
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; This function can use regexps instead of shell wildcards. If you
|
|
|
|
|
;; enter regexps remember to double each $ sign. For example, to
|
|
|
|
|
;; include files *.el, enter `.*\.el$$', resulting in the regexp
|
|
|
|
|
;; `.*\.el$'.
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; RESTRICTIONS ======================================================
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; * A few obscure ls switches are still ignored: see the docstring of
|
|
|
|
|
;; `insert-directory'.
|
1991-02-02 13:10:10 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; TO DO =============================================================
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Complete handling of F switch (if/when possible).
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; FJW: May be able to sort much faster by consing the sort key onto
|
|
|
|
|
;; the front of each list element, sorting and then stripping the key
|
|
|
|
|
;; off again!
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;;; History:
|
1993-03-17 17:17:05 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Written originally by Sebastian Kremer <sk@thp.uni-koeln.de>
|
|
|
|
|
;; Revised by Andrew Innes and Geoff Volker (and maybe others).
|
1995-12-28 23:36:50 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Modified by Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>, mainly
|
2005-11-22 19:25:50 +00:00
|
|
|
|
;; to support many more ls options, "platform emulation" and more
|
|
|
|
|
;; robust sorting.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
1998-04-17 05:24:48 +00:00
|
|
|
|
|
2017-07-30 02:02:49 +00:00
|
|
|
|
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defgroup ls-lisp nil
|
|
|
|
|
"Emulate the ls program completely in Emacs Lisp."
|
2001-01-02 23:39:40 +00:00
|
|
|
|
:version "21.1"
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
:group 'dired)
|
|
|
|
|
|
2010-11-11 08:28:35 +00:00
|
|
|
|
(defun ls-lisp-set-options ()
|
|
|
|
|
"Reset the ls-lisp options that depend on `ls-lisp-emulation'."
|
|
|
|
|
(mapc 'custom-reevaluate-setting
|
|
|
|
|
'(ls-lisp-ignore-case ls-lisp-dirs-first ls-lisp-verbosity)))
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defcustom ls-lisp-emulation
|
2009-08-22 21:59:40 +00:00
|
|
|
|
(cond ;; ((eq system-type 'windows-nt) 'MS-Windows)
|
2016-03-07 16:22:37 +00:00
|
|
|
|
((memq system-type '(hpux usg-unix-v berkeley-unix))
|
2010-11-11 08:28:35 +00:00
|
|
|
|
'UNIX)) ; very similar to GNU
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Anything else defaults to nil, meaning GNU.
|
2016-11-06 07:33:43 +00:00
|
|
|
|
"Platform to emulate: GNU (default), macOS, MS-Windows, UNIX.
|
2010-11-11 08:28:35 +00:00
|
|
|
|
Corresponding value is one of: nil, `MacOS', `MS-Windows', `UNIX'.
|
|
|
|
|
Set this to your preferred value; it need not match the actual platform
|
|
|
|
|
you are using.
|
|
|
|
|
|
|
|
|
|
This variable does not affect the behavior of ls-lisp directly.
|
|
|
|
|
Rather, it controls the default values for some variables that do:
|
|
|
|
|
`ls-lisp-ignore-case', `ls-lisp-dirs-first', and `ls-lisp-verbosity'.
|
|
|
|
|
|
|
|
|
|
If you change this variable directly (without using customize)
|
|
|
|
|
after loading `ls-lisp', you should use `ls-lisp-set-options' to
|
|
|
|
|
update the dependent variables."
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
:type '(choice (const :tag "GNU" nil)
|
|
|
|
|
(const MacOS)
|
|
|
|
|
(const MS-Windows)
|
|
|
|
|
(const UNIX))
|
2010-11-11 08:28:35 +00:00
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
|
:set (lambda (symbol value)
|
|
|
|
|
(unless (equal value (eval symbol))
|
|
|
|
|
(custom-set-default symbol value)
|
|
|
|
|
(ls-lisp-set-options)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2010-11-11 03:48:46 +00:00
|
|
|
|
;; Only made an obsolete alias in 23.3. Before that, the initial
|
|
|
|
|
;; value was set according to:
|
|
|
|
|
;; (or (memq ls-lisp-emulation '(MS-Windows MacOS))
|
|
|
|
|
;; (and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case))
|
|
|
|
|
;; Which isn't the right thing to do.
|
|
|
|
|
(define-obsolete-variable-alias 'ls-lisp-dired-ignore-case
|
|
|
|
|
'ls-lisp-ignore-case "21.1")
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defcustom ls-lisp-ignore-case
|
2010-11-11 03:48:46 +00:00
|
|
|
|
(memq ls-lisp-emulation '(MS-Windows MacOS))
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Non-nil causes ls-lisp alphabetic sorting to ignore case."
|
2010-11-11 03:59:04 +00:00
|
|
|
|
:set-after '(ls-lisp-emulation)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2014-09-01 14:57:21 +00:00
|
|
|
|
(defcustom ls-lisp-use-string-collate
|
|
|
|
|
(cond ((memq ls-lisp-emulation '(MacOS UNIX)) nil)
|
|
|
|
|
(t t)) ; GNU/Linux or MS-Windows emulate GNU ls
|
|
|
|
|
"Non-nil causes ls-lisp to sort files in locale-dependent collation order.
|
|
|
|
|
|
|
|
|
|
A value of nil means use ordinary string comparison (see `compare-strings')
|
|
|
|
|
for sorting files. A non-nil value uses `string-collate-lessp' instead,
|
|
|
|
|
which more closely emulates what GNU `ls' does.
|
|
|
|
|
|
|
|
|
|
On GNU/Linux systems, if the locale's codeset specifies UTF-8, as
|
|
|
|
|
in \"en_US.UTF-8\", the collation order follows the Unicode
|
|
|
|
|
Collation Algorithm (UCA), which places together file names that
|
|
|
|
|
differ only in punctuation characters. On MS-Windows, customize
|
|
|
|
|
the option `ls-lisp-UCA-like-collation' to a non-nil value to get
|
|
|
|
|
similar behavior."
|
2014-09-29 18:14:08 +00:00
|
|
|
|
:version "25.1"
|
2014-09-01 14:57:21 +00:00
|
|
|
|
:set-after '(ls-lisp-emulation)
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
|
|
|
|
(defcustom ls-lisp-UCA-like-collation t
|
|
|
|
|
"Non-nil means force ls-lisp use a collation order compatible with UCA.
|
|
|
|
|
|
|
|
|
|
UCA is the Unicode Collation Algorithm. GNU/Linux systems automatically
|
|
|
|
|
follow it in their string-collation routines if the locale specifies
|
|
|
|
|
UTF-8 as its codeset. On MS-Windows, customize this option to a non-nil
|
|
|
|
|
value to get similar behavior.
|
|
|
|
|
|
|
|
|
|
When this option is non-nil, and `ls-lisp-use-string-collate' is also
|
|
|
|
|
non-nil, the collation order produced on MS-Windows will ignore
|
|
|
|
|
punctuation and symbol characters, which will, for example, place
|
2015-06-30 22:06:31 +00:00
|
|
|
|
`.foo' near `foo'. See the documentation of `string-collate-lessp'
|
2014-09-01 14:57:21 +00:00
|
|
|
|
and `w32-collate-ignore-punctuation' for more details.
|
|
|
|
|
|
|
|
|
|
This option is ignored on platforms other than MS-Windows; to
|
|
|
|
|
control the collation ordering of the file names on those other
|
|
|
|
|
systems, set your locale instead."
|
2014-09-29 18:14:08 +00:00
|
|
|
|
:version "25.1"
|
2014-09-01 14:57:21 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defcustom ls-lisp-dirs-first (eq ls-lisp-emulation 'MS-Windows)
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Non-nil causes ls-lisp to sort directories first in any ordering.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
\(Or last if it is reversed.) Follows Microsoft Windows Explorer."
|
|
|
|
|
;; Functionality suggested by Chris McMahan <cmcmahan@one.net>
|
2010-11-11 03:59:04 +00:00
|
|
|
|
:set-after '(ls-lisp-emulation)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
|
|
|
|
(defcustom ls-lisp-verbosity
|
|
|
|
|
(cond ((eq ls-lisp-emulation 'MacOS) nil)
|
|
|
|
|
((eq ls-lisp-emulation 'MS-Windows)
|
|
|
|
|
(if (and (fboundp 'w32-using-nt) (w32-using-nt))
|
|
|
|
|
'(links))) ; distinguish NT/2K from 9x
|
|
|
|
|
((eq ls-lisp-emulation 'UNIX) '(links uid)) ; UNIX ls
|
|
|
|
|
(t '(links uid gid))) ; GNU ls
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"A list of optional file attributes that ls-lisp should display.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
It should contain none or more of the symbols: links, uid, gid.
|
2007-05-16 11:24:16 +00:00
|
|
|
|
A value of nil (or an empty list) means display none of them.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
|
|
|
|
Concepts come from UNIX: `links' means count of names associated with
|
2010-11-11 03:59:04 +00:00
|
|
|
|
the file; `uid' means user (owner) identifier; `gid' means group
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
identifier.
|
|
|
|
|
|
2010-11-11 03:59:04 +00:00
|
|
|
|
If emulation is MacOS then default is nil;
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
if emulation is MS-Windows then default is `(links)' if platform is
|
2010-11-11 03:59:04 +00:00
|
|
|
|
Windows NT/2K, nil otherwise;
|
|
|
|
|
if emulation is UNIX then default is `(links uid)';
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
if emulation is GNU then default is `(links uid gid)'."
|
2010-11-11 03:59:04 +00:00
|
|
|
|
:set-after '(ls-lisp-emulation)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Functionality suggested by Howard Melman <howard@silverstream.com>
|
|
|
|
|
:type '(set (const :tag "Show Link Count" links)
|
|
|
|
|
(const :tag "Show User" uid)
|
|
|
|
|
(const :tag "Show Group" gid))
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2003-01-20 05:45:05 +00:00
|
|
|
|
(defcustom ls-lisp-use-insert-directory-program
|
2009-08-22 21:59:40 +00:00
|
|
|
|
(not (memq system-type '(ms-dos windows-nt)))
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Non-nil causes ls-lisp to revert back to using `insert-directory-program'.
|
1998-10-14 03:43:20 +00:00
|
|
|
|
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
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
the contents of a directory."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2003-01-20 05:45:05 +00:00
|
|
|
|
;;; Autoloaded because it is let-bound in `recover-session', `mail-recover-1'.
|
|
|
|
|
;;;###autoload
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defcustom ls-lisp-support-shell-wildcards t
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Non-nil means ls-lisp treats file patterns as shell wildcards.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
Otherwise they are treated as Emacs regexps (for backward compatibility)."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2002-09-09 19:31:40 +00:00
|
|
|
|
(defcustom ls-lisp-format-time-list
|
|
|
|
|
'("%b %e %H:%M"
|
|
|
|
|
"%b %e %Y")
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"List of `format-time-string' specs to display file time stamps.
|
2007-01-27 13:21:19 +00:00
|
|
|
|
These specs are used ONLY if a valid locale can not be determined.
|
|
|
|
|
|
|
|
|
|
If `ls-lisp-use-localized-time-format' is non-nil, these specs are used
|
|
|
|
|
regardless of whether the locale can be determined.
|
2002-09-09 19:31:40 +00:00
|
|
|
|
|
|
|
|
|
Syntax: (EARLY-TIME-FORMAT OLD-TIME-FORMAT)
|
|
|
|
|
|
|
|
|
|
The EARLY-TIME-FORMAT is used if file has been modified within the
|
2010-11-11 03:59:04 +00:00
|
|
|
|
current year. The OLD-TIME-FORMAT is used for older files. To use ISO
|
2002-09-09 19:31:40 +00:00
|
|
|
|
8601 dates, you could set:
|
|
|
|
|
|
|
|
|
|
\(setq ls-lisp-format-time-list
|
2015-09-03 22:31:12 +00:00
|
|
|
|
\\='(\"%Y-%m-%d %H:%M\"
|
2002-09-09 19:31:40 +00:00
|
|
|
|
\"%Y-%m-%d \"))"
|
2002-09-17 00:43:53 +00:00
|
|
|
|
:type '(list (string :tag "Early time format")
|
|
|
|
|
(string :tag "Old time format"))
|
2002-09-09 19:31:40 +00:00
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2007-01-27 13:21:19 +00:00
|
|
|
|
(defcustom ls-lisp-use-localized-time-format nil
|
2010-11-11 03:59:04 +00:00
|
|
|
|
"Non-nil means to always use `ls-lisp-format-time-list' for time stamps.
|
|
|
|
|
This applies even if a valid locale is specified.
|
2007-01-27 13:21:19 +00:00
|
|
|
|
|
|
|
|
|
WARNING: Using localized date/time format might cause Dired columns
|
2010-11-11 03:59:04 +00:00
|
|
|
|
to fail to line up, e.g. if month names are not all of the same length."
|
2007-01-27 13:21:19 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'ls-lisp)
|
|
|
|
|
|
2015-06-06 09:52:56 +00:00
|
|
|
|
(defvar ls-lisp-uid-d-fmt " %d"
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
"Format to display integer UIDs.")
|
2015-06-06 09:52:56 +00:00
|
|
|
|
(defvar ls-lisp-uid-s-fmt " %s"
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
"Format to display user names.")
|
2015-06-06 09:52:56 +00:00
|
|
|
|
(defvar ls-lisp-gid-d-fmt " %d"
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
"Format to display integer GIDs.")
|
2015-06-06 09:52:56 +00:00
|
|
|
|
(defvar ls-lisp-gid-s-fmt " %s"
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
"Format to display user group names.")
|
2017-07-15 15:30:56 +00:00
|
|
|
|
(defvar ls-lisp-filesize-d-fmt " %d"
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
"Format to display integer file sizes.")
|
2017-07-15 15:30:56 +00:00
|
|
|
|
(defvar ls-lisp-filesize-f-fmt " %.0f"
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
"Format to display float file sizes.")
|
2017-07-15 15:30:56 +00:00
|
|
|
|
(defvar ls-lisp-filesize-b-fmt " %.0f"
|
2013-12-18 16:01:43 +00:00
|
|
|
|
"Format to display file sizes in blocks (for the -s switch).")
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
1998-10-14 03:43:20 +00:00
|
|
|
|
|
2013-09-13 14:56:03 +00:00
|
|
|
|
(defun ls-lisp--insert-directory (orig-fun file switches &optional wildcard full-directory-p)
|
1998-10-14 03:43:20 +00:00
|
|
|
|
"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.
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
This version of the function comes from `ls-lisp.el'.
|
|
|
|
|
If the value of `ls-lisp-use-insert-directory-program' is non-nil then
|
2013-09-13 14:56:03 +00:00
|
|
|
|
this advice just delegates the work to ORIG-FUN (the normal `insert-directory'
|
|
|
|
|
function from `files.el').
|
|
|
|
|
But if the value of `ls-lisp-use-insert-directory-program' is nil
|
|
|
|
|
then it runs a Lisp emulation.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
|
|
|
|
The Lisp emulation does not run any external programs or shells. It
|
|
|
|
|
supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards'
|
|
|
|
|
is non-nil; otherwise, it interprets wildcards as regular expressions
|
|
|
|
|
to match file names. It does not support all `ls' switches -- those
|
2014-09-01 15:03:45 +00:00
|
|
|
|
that work are: A a B C c F G g h i n R r S s t U u v X. The l switch
|
2010-11-06 09:57:24 +00:00
|
|
|
|
is assumed to be always present and cannot be turned off."
|
1998-10-14 03:43:20 +00:00
|
|
|
|
(if ls-lisp-use-insert-directory-program
|
2013-09-13 14:56:03 +00:00
|
|
|
|
(funcall orig-fun
|
2002-12-21 20:20:47 +00:00
|
|
|
|
file switches wildcard full-directory-p)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; We need the directory in order to find the right handler.
|
|
|
|
|
(let ((handler (find-file-name-handler (expand-file-name file)
|
2003-10-20 23:43:54 +00:00
|
|
|
|
'insert-directory))
|
2007-06-23 11:24:56 +00:00
|
|
|
|
(orig-file file)
|
2003-10-20 23:43:54 +00:00
|
|
|
|
wildcard-regexp)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if handler
|
|
|
|
|
(funcall handler 'insert-directory file switches
|
|
|
|
|
wildcard full-directory-p)
|
2003-05-14 16:20:51 +00:00
|
|
|
|
;; Remove --dired switch
|
|
|
|
|
(if (string-match "--dired " switches)
|
|
|
|
|
(setq switches (replace-match "" nil nil switches)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Convert SWITCHES to a list of characters.
|
2010-05-29 07:55:40 +00:00
|
|
|
|
(setq switches (delete ?\ (delete ?- (append switches nil))))
|
2003-10-20 23:43:54 +00:00
|
|
|
|
;; Sometimes we get ".../foo*/" as FILE. While the shell and
|
|
|
|
|
;; `ls' don't mind, we certainly do, because it makes us think
|
|
|
|
|
;; there is no wildcard, only a directory name.
|
|
|
|
|
(if (and ls-lisp-support-shell-wildcards
|
2007-06-23 09:52:06 +00:00
|
|
|
|
(string-match "[[?*]" file)
|
2007-06-23 11:24:56 +00:00
|
|
|
|
;; Prefer an existing file to wildcards, like
|
2007-06-23 09:52:06 +00:00
|
|
|
|
;; dired-noselect does.
|
2007-06-23 11:24:56 +00:00
|
|
|
|
(not (file-exists-p file)))
|
2003-10-20 23:43:54 +00:00
|
|
|
|
(progn
|
|
|
|
|
(or (not (eq (aref file (1- (length file))) ?/))
|
|
|
|
|
(setq file (substring file 0 (1- (length file)))))
|
|
|
|
|
(setq wildcard t)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if wildcard
|
2003-10-20 23:43:54 +00:00
|
|
|
|
(setq wildcard-regexp
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if ls-lisp-support-shell-wildcards
|
|
|
|
|
(wildcard-to-regexp (file-name-nondirectory file))
|
|
|
|
|
(file-name-nondirectory file))
|
|
|
|
|
file (file-name-directory file))
|
2003-10-20 23:43:54 +00:00
|
|
|
|
(if (memq ?B switches) (setq wildcard-regexp "[^~]\\'")))
|
2007-06-23 11:24:56 +00:00
|
|
|
|
(condition-case err
|
|
|
|
|
(ls-lisp-insert-directory
|
|
|
|
|
file switches (ls-lisp-time-index switches)
|
|
|
|
|
wildcard-regexp full-directory-p)
|
|
|
|
|
(invalid-regexp
|
|
|
|
|
;; Maybe they wanted a literal file that just happens to
|
|
|
|
|
;; use characters special to shell wildcards.
|
|
|
|
|
(if (equal (cadr err) "Unmatched [ or [^")
|
|
|
|
|
(progn
|
|
|
|
|
(setq wildcard-regexp (if (memq ?B switches) "[^~]\\'")
|
|
|
|
|
file (file-relative-name orig-file))
|
|
|
|
|
(ls-lisp-insert-directory
|
|
|
|
|
file switches (ls-lisp-time-index switches)
|
|
|
|
|
nil full-directory-p))
|
|
|
|
|
(signal (car err) (cdr err)))))
|
2001-12-21 15:22:06 +00:00
|
|
|
|
;; Try to insert the amount of free space.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
;; First find the line to put it on.
|
|
|
|
|
(when (re-search-forward "^total" nil t)
|
|
|
|
|
(let ((available (get-free-disk-space ".")))
|
|
|
|
|
(when available
|
2001-12-30 17:08:39 +00:00
|
|
|
|
;; Replace "total" with "total used", to avoid confusion.
|
|
|
|
|
(replace-match "total used in directory")
|
2001-12-21 15:22:06 +00:00
|
|
|
|
(end-of-line)
|
|
|
|
|
(insert " available " available)))))))))
|
2013-09-13 14:56:03 +00:00
|
|
|
|
(advice-add 'insert-directory :around #'ls-lisp--insert-directory)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
|
|
|
|
(defun ls-lisp-insert-directory
|
2003-10-20 23:43:54 +00:00
|
|
|
|
(file switches time-index wildcard-regexp full-directory-p)
|
1995-12-28 23:36:50 +00:00
|
|
|
|
"Insert directory listing for FILE, formatted according to SWITCHES.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
Leaves point after the inserted text. This is an internal function
|
|
|
|
|
optionally called by the `ls-lisp.el' version of `insert-directory'.
|
|
|
|
|
It is called recursively if the -R switch is used.
|
|
|
|
|
SWITCHES is a *list* of characters. TIME-INDEX is the time index into
|
2003-10-20 23:43:54 +00:00
|
|
|
|
file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does
|
|
|
|
|
not contain `d', so that a full listing is expected."
|
2016-02-23 10:12:55 +00:00
|
|
|
|
(if (or (and wildcard-regexp
|
|
|
|
|
(not (string= "[^~]\\'" wildcard-regexp))) ; Switch -B pseudo-wildcard regexp
|
|
|
|
|
full-directory-p)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(let* ((dir (file-name-as-directory file))
|
|
|
|
|
(default-directory dir) ; so that file-attributes works
|
|
|
|
|
(file-alist
|
2008-01-26 13:15:27 +00:00
|
|
|
|
(directory-files-and-attributes dir nil wildcard-regexp t
|
|
|
|
|
(if (memq ?n switches)
|
|
|
|
|
'integer
|
|
|
|
|
'string)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(sum 0)
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(max-uid-len 0)
|
|
|
|
|
(max-gid-len 0)
|
|
|
|
|
(max-file-size 0)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; do all bindings here for speed
|
2011-04-19 13:44:55 +00:00
|
|
|
|
total-line files elt short file-size attr
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
fuid fgid uid-len gid-len)
|
2012-02-07 17:44:36 +00:00
|
|
|
|
(setq file-alist (ls-lisp-sanitize file-alist))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(cond ((memq ?A switches)
|
|
|
|
|
(setq file-alist
|
|
|
|
|
(ls-lisp-delete-matching "^\\.\\.?$" file-alist)))
|
|
|
|
|
((not (memq ?a switches))
|
|
|
|
|
;; if neither -A nor -a, flush . files
|
|
|
|
|
(setq file-alist
|
|
|
|
|
(ls-lisp-delete-matching "^\\." file-alist))))
|
|
|
|
|
(setq file-alist
|
|
|
|
|
(ls-lisp-handle-switches file-alist switches))
|
|
|
|
|
(if (memq ?C switches) ; column (-C) format
|
|
|
|
|
(ls-lisp-column-format file-alist)
|
|
|
|
|
(setq total-line (cons (point) (car-safe file-alist)))
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
;; Find the appropriate format for displaying uid, gid, and
|
|
|
|
|
;; file size, by finding the longest strings among all the
|
|
|
|
|
;; files we are about to display.
|
|
|
|
|
(dolist (elt file-alist)
|
|
|
|
|
(setq attr (cdr elt)
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
fuid (file-attribute-user-id attr)
|
2008-05-03 10:28:39 +00:00
|
|
|
|
uid-len (if (stringp fuid) (string-width fuid)
|
|
|
|
|
(length (format "%d" fuid)))
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
fgid (file-attribute-group-id attr)
|
2008-05-03 10:28:39 +00:00
|
|
|
|
gid-len (if (stringp fgid) (string-width fgid)
|
|
|
|
|
(length (format "%d" fgid)))
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
file-size (file-attribute-size attr))
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(if (> uid-len max-uid-len)
|
|
|
|
|
(setq max-uid-len uid-len))
|
|
|
|
|
(if (> gid-len max-gid-len)
|
|
|
|
|
(setq max-gid-len gid-len))
|
|
|
|
|
(if (> file-size max-file-size)
|
|
|
|
|
(setq max-file-size file-size)))
|
|
|
|
|
(setq ls-lisp-uid-d-fmt (format " %%-%dd" max-uid-len))
|
|
|
|
|
(setq ls-lisp-uid-s-fmt (format " %%-%ds" max-uid-len))
|
|
|
|
|
(setq ls-lisp-gid-d-fmt (format " %%-%dd" max-gid-len))
|
|
|
|
|
(setq ls-lisp-gid-s-fmt (format " %%-%ds" max-gid-len))
|
|
|
|
|
(setq ls-lisp-filesize-d-fmt
|
2013-12-18 16:01:43 +00:00
|
|
|
|
(format " %%%dd" (length (format "%.0f" max-file-size))))
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(setq ls-lisp-filesize-f-fmt
|
2013-12-18 16:01:43 +00:00
|
|
|
|
(format " %%%d.0f" (length (format "%.0f" max-file-size))))
|
|
|
|
|
(if (memq ?s switches)
|
|
|
|
|
(setq ls-lisp-filesize-b-fmt
|
|
|
|
|
(format "%%%d.0f "
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(length (format "%.0f"
|
2013-12-18 16:01:43 +00:00
|
|
|
|
(fceiling
|
|
|
|
|
(/ max-file-size 1024.0)))))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(setq files file-alist)
|
|
|
|
|
(while files ; long (-l) format
|
|
|
|
|
(setq elt (car files)
|
|
|
|
|
files (cdr files)
|
|
|
|
|
short (car elt)
|
|
|
|
|
attr (cdr elt)
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
file-size (file-attribute-size attr))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(and attr
|
2019-07-22 11:45:40 +00:00
|
|
|
|
(setq sum (+ file-size sum))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(insert (ls-lisp-format short attr file-size
|
2010-11-11 03:59:04 +00:00
|
|
|
|
switches time-index))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Insert total size of all files:
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (car total-line))
|
|
|
|
|
(or (cdr total-line)
|
|
|
|
|
;; Shell says ``No match'' if no files match
|
|
|
|
|
;; the wildcard; let's say something similar.
|
|
|
|
|
(insert "(No match)\n"))
|
|
|
|
|
(insert (format "total %.0f\n" (fceiling (/ sum 1024.0))))))
|
2013-05-05 05:03:08 +00:00
|
|
|
|
;; dired-insert-directory expects to find point after the
|
|
|
|
|
;; text. But if the listing is empty, as e.g. in empty
|
2013-04-27 16:55:29 +00:00
|
|
|
|
;; directories with -a removed from switches, point will be
|
|
|
|
|
;; before the inserted text, and dired-insert-directory will
|
2020-03-25 14:18:37 +00:00
|
|
|
|
;; not indent the listing correctly. Getting past the
|
|
|
|
|
;; inserted text solves this.
|
|
|
|
|
(unless (cdr total-line) (forward-line 2))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if (memq ?R switches)
|
|
|
|
|
;; List the contents of all directories recursively.
|
|
|
|
|
;; cadr of each element of `file-alist' is t for
|
|
|
|
|
;; directory, string (name linked to) for symbolic
|
|
|
|
|
;; link, or nil.
|
1992-10-05 04:54:07 +00:00
|
|
|
|
(while file-alist
|
|
|
|
|
(setq elt (car file-alist)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
file-alist (cdr file-alist))
|
|
|
|
|
(when (and (eq (cadr elt) t) ; directory
|
2009-03-27 18:34:58 +00:00
|
|
|
|
;; Under -F, we have already decorated all
|
|
|
|
|
;; directories, including "." and "..", with
|
|
|
|
|
;; a /, so allow for that as well.
|
|
|
|
|
(not (string-match "\\`\\.\\.?/?\\'" (car elt))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(setq elt (expand-file-name (car elt) dir))
|
|
|
|
|
(insert "\n" elt ":\n")
|
|
|
|
|
(ls-lisp-insert-directory
|
2003-10-20 23:43:54 +00:00
|
|
|
|
elt switches time-index wildcard-regexp full-directory-p)))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; If not full-directory-p, FILE *must not* end in /, as
|
|
|
|
|
;; file-attributes will not recognize a symlink to a directory,
|
|
|
|
|
;; so must make it a relative filename as ls does:
|
2010-02-10 08:46:54 +00:00
|
|
|
|
(if (file-name-absolute-p file) (setq file (expand-file-name file)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if (eq (aref file (1- (length file))) ?/)
|
|
|
|
|
(setq file (substring file 0 -1)))
|
2003-12-27 18:12:39 +00:00
|
|
|
|
(let ((fattr (file-attributes file 'string)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if fattr
|
2010-05-29 07:55:40 +00:00
|
|
|
|
(insert (ls-lisp-format
|
|
|
|
|
(if (memq ?F switches)
|
|
|
|
|
(ls-lisp-classify-file file fattr)
|
|
|
|
|
file)
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
fattr (file-attribute-size fattr)
|
2019-02-15 13:45:23 +00:00
|
|
|
|
switches time-index))
|
|
|
|
|
;; Emulate what we do on Posix hosts when we call access-file
|
|
|
|
|
;; in insert-directory.
|
|
|
|
|
(signal 'file-error
|
|
|
|
|
(list "Reading directory"
|
|
|
|
|
"Directory doesn't exist or is inaccessible"
|
|
|
|
|
file))))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
2017-07-30 11:28:33 +00:00
|
|
|
|
(declare-function dired-read-dir-and-switches "dired" (str))
|
|
|
|
|
(declare-function dired-goto-next-file "dired" ())
|
|
|
|
|
|
2017-07-30 02:02:49 +00:00
|
|
|
|
(defun ls-lisp--dired (orig-fun dir-or-list &optional switches)
|
|
|
|
|
(interactive (dired-read-dir-and-switches ""))
|
2019-06-23 17:24:20 +00:00
|
|
|
|
(unless dir-or-list
|
|
|
|
|
(setq dir-or-list default-directory))
|
2017-07-30 02:02:49 +00:00
|
|
|
|
(if (consp dir-or-list)
|
|
|
|
|
(funcall orig-fun dir-or-list switches)
|
|
|
|
|
(let ((dir-wildcard (insert-directory-wildcard-in-dir-p
|
|
|
|
|
(expand-file-name dir-or-list))))
|
|
|
|
|
(if (not dir-wildcard)
|
|
|
|
|
(funcall orig-fun dir-or-list switches)
|
|
|
|
|
(let* ((default-directory (car dir-wildcard))
|
2017-08-04 15:53:48 +00:00
|
|
|
|
(files (file-expand-wildcards (cdr dir-wildcard)))
|
2017-07-30 02:02:49 +00:00
|
|
|
|
(dir (car dir-wildcard)))
|
|
|
|
|
(if files
|
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
|
(buf
|
|
|
|
|
(apply orig-fun (nconc (list dir) files) (and switches (list switches)))))
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(dired-goto-next-file)
|
|
|
|
|
(forward-line 0)
|
|
|
|
|
(insert " wildcard " (cdr dir-wildcard) "\n"))))
|
|
|
|
|
(user-error "No files matching regexp")))))))
|
|
|
|
|
|
|
|
|
|
(advice-add 'dired :around #'ls-lisp--dired)
|
|
|
|
|
|
2012-02-07 17:44:36 +00:00
|
|
|
|
(defun ls-lisp-sanitize (file-alist)
|
|
|
|
|
"Sanitize the elements in FILE-ALIST.
|
|
|
|
|
Fixes any elements in the alist for directory entries whose file
|
|
|
|
|
attributes are nil (meaning that `file-attributes' failed for
|
|
|
|
|
them). This is known to happen for some network shares, in
|
|
|
|
|
particular for the \"..\" directory entry.
|
|
|
|
|
|
|
|
|
|
If the \"..\" directory entry has nil attributes, the attributes
|
|
|
|
|
are copied from the \".\" entry, if they are non-nil. Otherwise,
|
|
|
|
|
the offending element is removed from the list, as are any
|
|
|
|
|
elements for other directory entries with nil attributes."
|
2019-08-31 06:54:05 +00:00
|
|
|
|
(if (and (consp (assoc ".." file-alist))
|
|
|
|
|
(null (cdr (assoc ".." file-alist)))
|
2012-02-07 17:44:36 +00:00
|
|
|
|
(cdr (assoc "." file-alist)))
|
|
|
|
|
(setcdr (assoc ".." file-alist) (cdr (assoc "." file-alist))))
|
|
|
|
|
(rassq-delete-all nil file-alist))
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defun ls-lisp-column-format (file-alist)
|
|
|
|
|
"Insert the file names (only) in FILE-ALIST into the current buffer.
|
|
|
|
|
Format in columns, sorted vertically, following GNU ls -C.
|
|
|
|
|
Responds to the window width as ls should but may not!"
|
|
|
|
|
(let (files fmt ncols collen (nfiles 0) (colwid 0))
|
|
|
|
|
;; Count number of files as `nfiles', build list of filenames as
|
|
|
|
|
;; `files', and find maximum filename length as `colwid':
|
|
|
|
|
(let (file len)
|
|
|
|
|
(while file-alist
|
|
|
|
|
(setq nfiles (1+ nfiles)
|
|
|
|
|
file (caar file-alist)
|
|
|
|
|
files (cons file files)
|
|
|
|
|
file-alist (cdr file-alist)
|
|
|
|
|
len (length file))
|
|
|
|
|
(if (> len colwid) (setq colwid len))))
|
|
|
|
|
(setq files (nreverse files)
|
|
|
|
|
colwid (+ 2 colwid) ; 2 character column gap
|
|
|
|
|
fmt (format "%%-%ds" colwid) ; print format
|
|
|
|
|
ncols (/ (window-width) colwid) ; no of columns
|
|
|
|
|
collen (/ nfiles ncols)) ; floor of column length
|
|
|
|
|
(if (> nfiles (* collen ncols)) (setq collen (1+ collen)))
|
|
|
|
|
;; Output the file names in columns, sorted vertically:
|
|
|
|
|
(let ((i 0) j)
|
|
|
|
|
(while (< i collen)
|
|
|
|
|
(setq j i)
|
|
|
|
|
(while (< j nfiles)
|
|
|
|
|
(insert (format fmt (nth j files)))
|
|
|
|
|
(setq j (+ j collen)))
|
|
|
|
|
;; FJW: This is completely unnecessary, but I don't like
|
|
|
|
|
;; trailing white space...
|
|
|
|
|
(delete-region (point) (progn (skip-chars-backward " \t") (point)))
|
|
|
|
|
(insert ?\n)
|
|
|
|
|
(setq i (1+ i))))))
|
1992-10-05 04:54:07 +00:00
|
|
|
|
|
|
|
|
|
(defun ls-lisp-delete-matching (regexp list)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
"Delete all elements matching REGEXP from LIST, return new list."
|
1991-09-27 10:03:30 +00:00
|
|
|
|
;; Should perhaps use setcdr for efficiency.
|
1991-09-26 16:03:09 +00:00
|
|
|
|
(let (result)
|
|
|
|
|
(while list
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(or (string-match regexp (caar list))
|
1991-09-26 16:03:09 +00:00
|
|
|
|
(setq result (cons (car list) result)))
|
|
|
|
|
(setq list (cdr list)))
|
|
|
|
|
result))
|
|
|
|
|
|
2017-10-24 23:19:37 +00:00
|
|
|
|
(defvar w32-collate-ignore-punctuation) ; Declare for non-w32 builds.
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defsubst ls-lisp-string-lessp (s1 s2)
|
2014-09-01 14:57:21 +00:00
|
|
|
|
"Return t if string S1 should sort before string S2.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
Case is significant if `ls-lisp-ignore-case' is nil.
|
2014-09-01 14:57:21 +00:00
|
|
|
|
Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil,
|
2015-06-30 22:06:31 +00:00
|
|
|
|
`compare-strings' otherwise.
|
2014-09-01 14:57:21 +00:00
|
|
|
|
On GNU/Linux systems, if the locale specifies UTF-8 as the codeset,
|
|
|
|
|
the sorting order will place together file names that differ only
|
|
|
|
|
by punctuation characters, like `.emacs' and `emacs'. To have a
|
2014-09-11 19:44:25 +00:00
|
|
|
|
similar behavior on MS-Windows, customize `ls-lisp-UCA-like-collation'
|
2014-09-01 14:57:21 +00:00
|
|
|
|
to a non-nil value."
|
|
|
|
|
(let ((w32-collate-ignore-punctuation ls-lisp-UCA-like-collation))
|
|
|
|
|
(if ls-lisp-use-string-collate
|
|
|
|
|
(string-collate-lessp s1 s2 nil ls-lisp-ignore-case)
|
|
|
|
|
(let ((u (compare-strings s1 0 nil s2 0 nil ls-lisp-ignore-case)))
|
|
|
|
|
(and (numberp u) (< u 0))))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
2014-09-01 15:03:45 +00:00
|
|
|
|
(defun ls-lisp-version-lessp (s1 s2)
|
|
|
|
|
"Return t if versioned string S1 should sort before versioned string S2.
|
|
|
|
|
|
|
|
|
|
Case is significant if `ls-lisp-ignore-case' is nil.
|
|
|
|
|
This is the same as string-lessp (with the exception of case
|
|
|
|
|
insensitivity), but sequences of digits are compared numerically,
|
|
|
|
|
as a whole, in the same manner as the `strverscmp' function available
|
|
|
|
|
in some standard C libraries does."
|
|
|
|
|
(let ((i1 0)
|
|
|
|
|
(i2 0)
|
|
|
|
|
(len1 (length s1))
|
|
|
|
|
(len2 (length s2))
|
|
|
|
|
(val 0)
|
|
|
|
|
ni1 ni2 e1 e2 found-2-numbers-p)
|
|
|
|
|
(while (and (< i1 len1) (< i2 len2) (zerop val))
|
|
|
|
|
(unless found-2-numbers-p
|
|
|
|
|
(setq ni1 (string-match "[0-9]+" s1 i1)
|
|
|
|
|
e1 (match-end 0))
|
|
|
|
|
(setq ni2 (string-match "[0-9]+" s2 i2)
|
|
|
|
|
e2 (match-end 0)))
|
|
|
|
|
(cond
|
|
|
|
|
((and ni1 ni2)
|
|
|
|
|
(cond
|
|
|
|
|
((and (> ni1 i1) (> ni2 i2))
|
|
|
|
|
;; Compare non-numerical part as strings.
|
|
|
|
|
(setq val (compare-strings s1 i1 ni1 s2 i2 ni2 ls-lisp-ignore-case)
|
|
|
|
|
i1 ni1
|
|
|
|
|
i2 ni2
|
|
|
|
|
found-2-numbers-p t))
|
|
|
|
|
((and (= ni1 i1) (= ni2 i2))
|
|
|
|
|
(setq found-2-numbers-p nil)
|
|
|
|
|
;; Compare numerical parts as integral and/or fractional parts.
|
|
|
|
|
(let* ((sub1 (substring s1 ni1 e1))
|
|
|
|
|
(sub2 (substring s2 ni2 e2))
|
|
|
|
|
;; "Fraction" is a numerical sequence with leading zeros.
|
|
|
|
|
(fr1 (string-match "\\`0+" sub1))
|
|
|
|
|
(fr2 (string-match "\\`0+" sub2)))
|
|
|
|
|
(cond
|
|
|
|
|
((and fr1 fr2) ; two fractions, the shortest wins
|
|
|
|
|
(setq val (- val (- (length sub1) (length sub2)))))
|
|
|
|
|
(fr1 ; a fraction is always less than an integral
|
|
|
|
|
(setq val (- ni1)))
|
|
|
|
|
(fr2
|
|
|
|
|
(setq val ni2)))
|
|
|
|
|
(if (zerop val) ; fall back on numerical comparison
|
|
|
|
|
(setq val (- (string-to-number sub1)
|
|
|
|
|
(string-to-number sub2))))
|
|
|
|
|
(setq i1 e1
|
|
|
|
|
i2 e2)))
|
|
|
|
|
(t
|
|
|
|
|
(setq val (compare-strings s1 i1 nil s2 i2 nil ls-lisp-ignore-case)
|
|
|
|
|
i1 len1
|
|
|
|
|
i2 len2))))
|
|
|
|
|
(t (setq val (compare-strings s1 i1 nil s2 i2 nil ls-lisp-ignore-case)
|
|
|
|
|
i1 len1
|
|
|
|
|
i2 len2)))
|
|
|
|
|
(and (eq val t) (setq val 0)))
|
|
|
|
|
(if (zerop val)
|
|
|
|
|
(setq val (- len1 len2)))
|
|
|
|
|
(< val 0)))
|
|
|
|
|
|
1992-10-05 04:54:07 +00:00
|
|
|
|
(defun ls-lisp-handle-switches (file-alist switches)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
"Return new FILE-ALIST sorted according to SWITCHES.
|
|
|
|
|
SWITCHES is a list of characters. Default sorting is alphabetic."
|
1991-09-26 16:03:09 +00:00
|
|
|
|
;; FILE-ALIST's elements are (FILE . FILE-ATTRIBUTES).
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(or (memq ?U switches) ; unsorted
|
|
|
|
|
;; Catch and ignore unexpected sorting errors
|
|
|
|
|
(condition-case err
|
|
|
|
|
(setq file-alist
|
|
|
|
|
(let (index)
|
|
|
|
|
;; Copy file-alist in case of error
|
|
|
|
|
(sort (copy-sequence file-alist) ; modifies its argument!
|
|
|
|
|
(cond ((memq ?S switches)
|
|
|
|
|
(lambda (x y) ; sorted on size
|
|
|
|
|
;; Make largest file come first
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(< (file-attribute-size (cdr y))
|
|
|
|
|
(file-attribute-size (cdr x)))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
((setq index (ls-lisp-time-index switches))
|
|
|
|
|
(lambda (x y) ; sorted on time
|
2010-11-10 04:28:16 +00:00
|
|
|
|
(time-less-p (nth index (cdr y))
|
|
|
|
|
(nth index (cdr x)))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
((memq ?X switches)
|
|
|
|
|
(lambda (x y) ; sorted on extension
|
|
|
|
|
(ls-lisp-string-lessp
|
|
|
|
|
(ls-lisp-extension (car x))
|
|
|
|
|
(ls-lisp-extension (car y)))))
|
2014-09-01 15:03:45 +00:00
|
|
|
|
((memq ?v switches)
|
|
|
|
|
(lambda (x y) ; sorted by version number
|
|
|
|
|
(ls-lisp-version-lessp (car x) (car y))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(t
|
|
|
|
|
(lambda (x y) ; sorted alphabetically
|
|
|
|
|
(ls-lisp-string-lessp (car x) (car y))))))))
|
|
|
|
|
(error (message "Unsorted (ls-lisp sorting error) - %s"
|
|
|
|
|
(error-message-string err))
|
|
|
|
|
(ding) (sit-for 2)))) ; to show user the message!
|
|
|
|
|
(if (memq ?F switches) ; classify switch
|
|
|
|
|
(setq file-alist (mapcar 'ls-lisp-classify file-alist)))
|
|
|
|
|
(if ls-lisp-dirs-first
|
|
|
|
|
;; Re-sort directories first, without otherwise changing the
|
|
|
|
|
;; ordering, and reverse whole list. cadr of each element of
|
|
|
|
|
;; `file-alist' is t for directory, string (name linked to) for
|
|
|
|
|
;; symbolic link, or nil.
|
|
|
|
|
(let (el dirs files)
|
|
|
|
|
(while file-alist
|
2005-11-22 19:25:50 +00:00
|
|
|
|
(if (or (eq (cadr (setq el (car file-alist))) t) ; directory
|
|
|
|
|
(and (stringp (cadr el))
|
|
|
|
|
(file-directory-p (cadr el)))) ; symlink to a directory
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(setq dirs (cons el dirs))
|
|
|
|
|
(setq files (cons el files)))
|
|
|
|
|
(setq file-alist (cdr file-alist)))
|
|
|
|
|
(setq file-alist
|
|
|
|
|
(if (memq ?U switches) ; unsorted order is reversed
|
|
|
|
|
(nconc dirs files)
|
|
|
|
|
(nconc files dirs)
|
|
|
|
|
))))
|
|
|
|
|
;; Finally reverse file alist if necessary.
|
|
|
|
|
;; (eq below MUST compare `(not (memq ...))' to force comparison of
|
2015-05-21 17:04:45 +00:00
|
|
|
|
;; t or nil, rather than list tails!)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if (eq (eq (not (memq ?U switches)) ; unsorted order is reversed
|
|
|
|
|
(not (memq ?r switches))) ; reversed sort order requested
|
|
|
|
|
ls-lisp-dirs-first) ; already reversed
|
|
|
|
|
(nreverse file-alist)
|
|
|
|
|
file-alist))
|
|
|
|
|
|
2010-05-29 07:55:40 +00:00
|
|
|
|
(defun ls-lisp-classify-file (filename fattr)
|
|
|
|
|
"Append a character to FILENAME indicating the file type.
|
|
|
|
|
|
2017-11-25 10:35:09 +00:00
|
|
|
|
This function puts the `dired-filename' property on FILENAME, but
|
|
|
|
|
not on the character indicator it appends.
|
2010-05-29 07:55:40 +00:00
|
|
|
|
FATTR is the file attributes returned by `file-attributes' for the file.
|
|
|
|
|
The file type indicators are `/' for directories, `@' for symbolic
|
|
|
|
|
links, `|' for FIFOs, `=' for sockets, `*' for regular files that
|
|
|
|
|
are executable, and nothing for other types of files."
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(let* ((type (file-attribute-type fattr))
|
|
|
|
|
(modestr (file-attribute-modes fattr))
|
2017-11-25 10:35:09 +00:00
|
|
|
|
(typestr (substring modestr 0 1))
|
|
|
|
|
(file-name (propertize filename 'dired-filename t)))
|
2010-05-29 07:55:40 +00:00
|
|
|
|
(cond
|
|
|
|
|
(type
|
2017-11-25 10:35:09 +00:00
|
|
|
|
(concat file-name (if (eq type t) "/" "@")))
|
2010-05-29 07:55:40 +00:00
|
|
|
|
((string-match "x" modestr)
|
2017-11-25 10:35:09 +00:00
|
|
|
|
(concat file-name "*"))
|
2010-05-29 07:55:40 +00:00
|
|
|
|
((string= "p" typestr)
|
2017-11-25 10:35:09 +00:00
|
|
|
|
(concat file-name "|"))
|
2010-05-29 07:55:40 +00:00
|
|
|
|
((string= "s" typestr)
|
2017-11-25 10:35:09 +00:00
|
|
|
|
(concat file-name "="))
|
|
|
|
|
(t file-name))))
|
2010-05-29 07:55:40 +00:00
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(defun ls-lisp-classify (filedata)
|
2010-05-29 07:55:40 +00:00
|
|
|
|
"Append a character to file name in FILEDATA indicating the file type.
|
|
|
|
|
|
|
|
|
|
FILEDATA has the form (FILENAME . ATTRIBUTES), where ATTRIBUTES is the
|
|
|
|
|
structure returned by `file-attributes' for that file.
|
|
|
|
|
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
The file type indicators are `/' for directories, `@' for symbolic
|
2010-05-29 07:55:40 +00:00
|
|
|
|
links, `|' for FIFOs, `=' for sockets, `*' for regular files that
|
|
|
|
|
are executable, and nothing for other types of files."
|
2005-11-22 19:25:50 +00:00
|
|
|
|
(let ((file-name (car filedata))
|
2010-05-29 07:55:40 +00:00
|
|
|
|
(fattr (cdr filedata)))
|
|
|
|
|
(cons (ls-lisp-classify-file file-name fattr) fattr)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
|
|
|
|
|
(defun ls-lisp-extension (filename)
|
|
|
|
|
"Return extension of FILENAME (ignoring any version extension)
|
|
|
|
|
FOLLOWED by null and full filename, SOLELY for full alpha sort."
|
|
|
|
|
;; Force extension sort order: `no ext' then `null ext' then `ext'
|
|
|
|
|
;; to agree with GNU ls.
|
|
|
|
|
(concat
|
|
|
|
|
(let* ((i (length filename)) end)
|
|
|
|
|
(if (= (aref filename (1- i)) ?.) ; null extension
|
|
|
|
|
"\0"
|
|
|
|
|
(while (and (>= (setq i (1- i)) 0)
|
|
|
|
|
(/= (aref filename i) ?.)))
|
|
|
|
|
(if (< i 0) "\0\0" ; no extension
|
|
|
|
|
(if (/= (aref filename (1+ i)) ?~)
|
|
|
|
|
(substring filename (1+ i))
|
|
|
|
|
;; version extension found -- ignore it
|
|
|
|
|
(setq end i)
|
|
|
|
|
(while (and (>= (setq i (1- i)) 0)
|
|
|
|
|
(/= (aref filename i) ?.)))
|
|
|
|
|
(if (< i 0) "\0\0" ; no extension
|
|
|
|
|
(substring filename (1+ i) end))))
|
|
|
|
|
)) "\0" filename))
|
1991-02-02 13:10:10 +00:00
|
|
|
|
|
2010-11-11 03:59:04 +00:00
|
|
|
|
(defun ls-lisp-format (file-name file-attr file-size switches time-index)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
"Format one line of long ls output for file FILE-NAME.
|
|
|
|
|
FILE-ATTR and FILE-SIZE give the file's attributes and size.
|
2010-11-11 03:59:04 +00:00
|
|
|
|
SWITCHES and TIME-INDEX give the full switch list and time data."
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(let ((file-type (file-attribute-type file-attr))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; t for directory, string (name linked to)
|
|
|
|
|
;; for symbolic link, or nil.
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(drwxrwxrwx (file-attribute-modes file-attr)))
|
1991-09-26 16:03:09 +00:00
|
|
|
|
(concat (if (memq ?i switches) ; inode number
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(let ((inode (file-attribute-inode-number file-attr)))
|
|
|
|
|
(format " %18d " inode)))
|
1991-09-27 10:03:30 +00:00
|
|
|
|
;; nil is treated like "" in concat
|
2013-12-18 16:01:43 +00:00
|
|
|
|
(if (memq ?s switches) ; size in K, rounded up
|
|
|
|
|
;; In GNU ls, -h affects the size in blocks, displayed
|
|
|
|
|
;; by -s, as well.
|
|
|
|
|
(if (memq ?h switches)
|
|
|
|
|
(format "%6s "
|
|
|
|
|
(file-size-human-readable
|
|
|
|
|
;; We use 1K as "block size", although
|
|
|
|
|
;; most Windows volumes use 4KB to 8KB
|
|
|
|
|
;; clusters, and exFAT will usually have
|
|
|
|
|
;; clusters of 32KB or even 128KB. See
|
|
|
|
|
;; KB article 140365 for the details.
|
|
|
|
|
(* 1024.0 (fceiling (/ file-size 1024.0)))))
|
|
|
|
|
(format ls-lisp-filesize-b-fmt
|
|
|
|
|
(fceiling (/ file-size 1024.0)))))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
drwxrwxrwx ; attribute string
|
|
|
|
|
(if (memq 'links ls-lisp-verbosity)
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(format "%3d" (file-attribute-link-number file-attr)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; Numeric uid/gid are more confusing than helpful;
|
1991-09-26 16:03:09 +00:00
|
|
|
|
;; Emacs should be able to make strings of them.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
;; They tend to be bogus on non-UNIX platforms anyway so
|
|
|
|
|
;; optionally hide them.
|
|
|
|
|
(if (memq 'uid ls-lisp-verbosity)
|
2010-10-12 23:25:19 +00:00
|
|
|
|
;; uid can be a string or an integer
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(let ((uid (file-attribute-user-id file-attr)))
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(format (if (stringp uid)
|
|
|
|
|
ls-lisp-uid-s-fmt
|
|
|
|
|
ls-lisp-uid-d-fmt)
|
|
|
|
|
uid)))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(if (not (memq ?G switches)) ; GNU ls -- shows group by default
|
|
|
|
|
(if (or (memq ?g switches) ; UNIX ls -- no group by default
|
|
|
|
|
(memq 'gid ls-lisp-verbosity))
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
|
(let ((gid (file-attribute-group-id file-attr)))
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(format (if (stringp gid)
|
|
|
|
|
ls-lisp-gid-s-fmt
|
|
|
|
|
ls-lisp-gid-d-fmt)
|
|
|
|
|
gid))))
|
2003-05-01 11:16:21 +00:00
|
|
|
|
(ls-lisp-format-file-size file-size (memq ?h switches))
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
" "
|
2010-11-11 03:59:04 +00:00
|
|
|
|
(ls-lisp-format-time file-attr time-index)
|
1992-04-30 10:29:53 +00:00
|
|
|
|
" "
|
2017-11-25 15:03:53 +00:00
|
|
|
|
(if (not (memq ?F switches)) ; ls-lisp-classify-file already did that
|
2009-01-28 19:02:17 +00:00
|
|
|
|
(propertize file-name 'dired-filename t)
|
|
|
|
|
file-name)
|
1991-02-02 13:10:10 +00:00
|
|
|
|
(if (stringp file-type) ; is a symbolic link
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
(concat " -> " file-type))
|
1991-02-02 13:10:10 +00:00
|
|
|
|
"\n"
|
|
|
|
|
)))
|
|
|
|
|
|
1992-10-05 04:54:07 +00:00
|
|
|
|
(defun ls-lisp-time-index (switches)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
"Return time index into file-attributes according to ls SWITCHES list.
|
|
|
|
|
Return nil if no time switch found."
|
|
|
|
|
;; FJW: Default of nil is IMPORTANT and used in `ls-lisp-handle-switches'!
|
|
|
|
|
(cond ((memq ?c switches) 6) ; last mode change
|
|
|
|
|
((memq ?t switches) 5) ; last modtime
|
|
|
|
|
((memq ?u switches) 4))) ; last access
|
|
|
|
|
|
2020-10-31 09:41:53 +00:00
|
|
|
|
(defvar ls-lisp--time-locale nil
|
|
|
|
|
"Locale to be used for formatting file times.")
|
|
|
|
|
|
2010-11-11 03:59:04 +00:00
|
|
|
|
(defun ls-lisp-format-time (file-attr time-index)
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
"Format time for file with attributes FILE-ATTR according to TIME-INDEX.
|
|
|
|
|
Use the same method as ls to decide whether to show time-of-day or year,
|
2010-11-11 03:59:04 +00:00
|
|
|
|
depending on distance between file date and the current time.
|
From Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>:
Better support for the Mac and MS-Windows.
(ls-lisp): New defgroup.
(ls-lisp-emulation, ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity, ls-lisp-use-insert-directory-program)
(ls-lisp-support-shell-wildcards): New defcustoms.
(ls-lisp-parse-symlink): New function.
(insert-directory): Code to convert switches to a list and set up
the wildcard argument copied from ls-lisp-insert-directory.
(ls-lisp-insert-directory): New argument TIME-INDEX. Add support
for -C and -R switches.
(ls-lisp-column-format): New function.
(ls-lisp-delete-matching, ls-lisp-handle-switches)
(ls-lisp-format-time): Add doc strings.
(ls-lisp-handle-switches): Handle -U, -S, -X, and -F switches.
Support ls-lisp-dirs-first.
(ls-lisp-classify, ls-lisp-extension): New functions.
(ls-lisp-format): Optionally support emulation of symlinks.
Support -i, -s, and -G switches.
2000-12-27 17:07:40 +00:00
|
|
|
|
All ls time options, namely c, t and u, are handled."
|
|
|
|
|
(let* ((time (nth (or time-index 5) file-attr)) ; default is last modtime
|
2017-10-22 08:04:36 +00:00
|
|
|
|
(diff (time-subtract time nil))
|
2001-11-06 01:56:02 +00:00
|
|
|
|
;; Consider a time to be recent if it is within the past six
|
|
|
|
|
;; months. A Gregorian year has 365.2425 * 24 * 60 * 60 ==
|
|
|
|
|
;; 31556952 seconds on the average, and half of that is 15778476.
|
|
|
|
|
;; Write the constant explicitly to avoid roundoff error.
|
|
|
|
|
(past-cutoff -15778476)) ; half a Gregorian year
|
1999-05-02 09:40:45 +00:00
|
|
|
|
(condition-case nil
|
2001-11-06 01:56:02 +00:00
|
|
|
|
;; Use traditional time format in the C or POSIX locale,
|
|
|
|
|
;; ISO-style time format otherwise, so columns line up.
|
2020-10-31 09:41:53 +00:00
|
|
|
|
(let ((locale (or system-time-locale ls-lisp--time-locale)))
|
2001-11-06 01:56:02 +00:00
|
|
|
|
(if (not locale)
|
|
|
|
|
(let ((vars '("LC_ALL" "LC_TIME" "LANG")))
|
|
|
|
|
(while (and vars (not (setq locale (getenv (car vars)))))
|
2020-10-31 09:41:53 +00:00
|
|
|
|
(setq vars (cdr vars)))
|
|
|
|
|
;; Cache the locale for next calls.
|
|
|
|
|
(setq ls-lisp--time-locale (or locale "C"))))
|
2001-11-06 01:56:02 +00:00
|
|
|
|
(if (member locale '("C" "POSIX"))
|
|
|
|
|
(setq locale nil))
|
|
|
|
|
(format-time-string
|
2017-10-22 08:04:36 +00:00
|
|
|
|
(if (and (not (time-less-p diff past-cutoff))
|
|
|
|
|
(not (time-less-p 0 diff)))
|
2007-01-27 13:21:19 +00:00
|
|
|
|
(if (and locale (not ls-lisp-use-localized-time-format))
|
|
|
|
|
"%m-%d %H:%M"
|
|
|
|
|
(nth 0 ls-lisp-format-time-list))
|
|
|
|
|
(if (and locale (not ls-lisp-use-localized-time-format))
|
|
|
|
|
"%Y-%m-%d "
|
|
|
|
|
(nth 1 ls-lisp-format-time-list)))
|
2001-11-06 01:56:02 +00:00
|
|
|
|
time))
|
1999-06-16 19:54:45 +00:00
|
|
|
|
(error "Unk 0 0000"))))
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
2003-05-01 11:16:21 +00:00
|
|
|
|
(defun ls-lisp-format-file-size (file-size human-readable)
|
(ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt, ls-lisp-gid-d-fmt)
(ls-lisp-gid-s-fmt, ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt): New
defvars.
(ls-lisp-insert-directory): Dynamically compute format specifiers for
displaying UID, GID, and file size, and store them in the above variables.
(ls-lisp-format): Use ls-lisp-filesize-f-fmt, ls-lisp-uid-s-fmt,
ls-lisp-uid-d-fmt, ls-lisp-gid-s-fmt, and ls-lisp-gid-d-fmt instead of
constant format strings.
(ls-lisp-format-file-size): Use ls-lisp-filesize-f-fmt and
ls-lisp-filesize-d-fmt instead of constant format strings.
2008-04-25 10:36:27 +00:00
|
|
|
|
(if (not human-readable)
|
|
|
|
|
(format (if (floatp file-size)
|
|
|
|
|
ls-lisp-filesize-f-fmt
|
|
|
|
|
ls-lisp-filesize-d-fmt)
|
|
|
|
|
file-size)
|
2013-12-18 16:01:43 +00:00
|
|
|
|
(format " %6s" (file-size-human-readable file-size))))
|
2003-05-01 11:16:21 +00:00
|
|
|
|
|
2017-07-25 05:53:44 +00:00
|
|
|
|
(defun ls-lisp-unload-function ()
|
|
|
|
|
"Unload ls-lisp library."
|
|
|
|
|
(advice-remove 'insert-directory #'ls-lisp--insert-directory)
|
2017-07-30 02:02:49 +00:00
|
|
|
|
(advice-remove 'dired #'ls-lisp--dired)
|
2017-07-25 05:53:44 +00:00
|
|
|
|
;; Continue standard unloading.
|
|
|
|
|
nil)
|
|
|
|
|
|
1992-10-05 04:54:07 +00:00
|
|
|
|
(provide 'ls-lisp)
|
1992-04-30 10:29:53 +00:00
|
|
|
|
|
1993-03-17 17:17:05 +00:00
|
|
|
|
;;; ls-lisp.el ends here
|