X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ba4502fe1465f7803beca3ae187e41f0b25bef10..374c21d59a3e2b8a49c7e4ecc466edb5313dbb98:/lisp/ls-lisp.el?ds=sidebyside diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 03ee0d25cc..6b5304caad 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -1,6 +1,6 @@ ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp -;; Copyright (C) 1992, 1994, 2000-2014 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 2000-2016 Free Software Foundation, Inc. ;; Author: Sebastian Kremer ;; Modified by: Francis J. Wright @@ -144,7 +144,7 @@ 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 -\`.foo' near `foo'. See the documentation of `string-collate-lessp' +`.foo' near `foo'. See the documentation of `string-collate-lessp' and `w32-collate-ignore-punctuation' for more details. This option is ignored on platforms other than MS-Windows; to @@ -222,7 +222,7 @@ current year. The OLD-TIME-FORMAT is used for older files. To use ISO 8601 dates, you could set: \(setq ls-lisp-format-time-list - '(\"%Y-%m-%d %H:%M\" + \\='(\"%Y-%m-%d %H:%M\" \"%Y-%m-%d \"))" :type '(list (string :tag "Early time format") (string :tag "Old time format")) @@ -237,13 +237,13 @@ to fail to line up, e.g. if month names are not all of the same length." :type 'boolean :group 'ls-lisp) -(defvar ls-lisp-uid-d-fmt "-%d" +(defvar ls-lisp-uid-d-fmt " %d" "Format to display integer UIDs.") -(defvar ls-lisp-uid-s-fmt "-%s" +(defvar ls-lisp-uid-s-fmt " %s" "Format to display user names.") -(defvar ls-lisp-gid-d-fmt "-%d" +(defvar ls-lisp-gid-d-fmt " %d" "Format to display integer GIDs.") -(defvar ls-lisp-gid-s-fmt "-%s" +(defvar ls-lisp-gid-s-fmt " %s" "Format to display user group names.") (defvar ls-lisp-filesize-d-fmt "%d" "Format to display integer file sizes.") @@ -539,7 +539,7 @@ Responds to the window width as ls should but may not!" "Return t if string S1 should sort before string S2. Case is significant if `ls-lisp-ignore-case' is nil. Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil, -\`compare-strings' otherwise. +`compare-strings' otherwise. 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 @@ -669,7 +669,7 @@ SWITCHES is a list of characters. Default sorting is alphabetic." )))) ;; Finally reverse file alist if necessary. ;; (eq below MUST compare `(not (memq ...))' to force comparison of - ;; `t' or `nil', rather than list tails!) + ;; t or nil, rather than list tails!) (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