changeset 111602:f44b93254721

Fix some ls-lisp oddness. * lisp/ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
author Glenn Morris <rgm@gnu.org>
date Wed, 10 Nov 2010 19:48:46 -0800
parents 03ddd0223c7a
children c901fac3b428
files lisp/ChangeLog lisp/ls-lisp.el
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Nov 10 15:39:17 2010 +0200
+++ b/lisp/ChangeLog	Wed Nov 10 19:48:46 2010 -0800
@@ -1,3 +1,7 @@
+2010-11-11  Glenn Morris  <rgm@gnu.org>
+
+	* ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
+
 2010-11-10  Glenn Morris  <rgm@gnu.org>
 
 	* printing.el (pr-menu-bind): Doc fix.
--- a/lisp/ls-lisp.el	Wed Nov 10 15:39:17 2010 +0200
+++ b/lisp/ls-lisp.el	Wed Nov 10 19:48:46 2010 -0800
@@ -86,10 +86,16 @@
 		 (const UNIX))
   :group 'ls-lisp)
 
+;; 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")
+
 (defcustom ls-lisp-ignore-case
-  ;; Name change for consistency with other option names.
-  (or (memq ls-lisp-emulation '(MS-Windows MacOS))
-      (and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case))
+  (memq ls-lisp-emulation '(MS-Windows MacOS))
   "Non-nil causes ls-lisp alphabetic sorting to ignore case."
   :type 'boolean
   :group 'ls-lisp)