Merge from origin/emacs-24

[gnu-emacs] / lisp / ls-lisp.el

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index b8ea8d07f053ab7df8fb04da90ae3ad3d8f460e1..c3d5705531e22f897dc8f9b6ac2778df1ba0d41d 100644 (file)
--- 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-2015 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
@@ -128,7 +128,7 @@ 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."
-  :version "24.5"
+  :version "25.1"
   :set-after '(ls-lisp-emulation)
   :type 'boolean
   :group 'ls-lisp)
@@ -150,7 +150,7 @@ 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."
-  :version "24.5"
+  :version "25.1"
   :type 'boolean
   :group 'ls-lisp)
 
@@ -543,7 +543,7 @@ Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil,
 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
-similar behavior on MS-Widnows, customize `ls-lisp-UCA-like-collation'
+similar behavior on MS-Windows, customize `ls-lisp-UCA-like-collation'
 to a non-nil value."
   (let ((w32-collate-ignore-punctuation ls-lisp-UCA-like-collation))
     (if ls-lisp-use-string-collate