Fix some ls-lisp oddness.

* lisp/ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcaa0494706c1f50b79c13fe37448c532ab82106..cefe89ab338f4315e3b0501b792b2e917310c89d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index b01ad6f9510105c2e972ad7d8ee7ef6e0551ccc5..c7023add59b7e2986a37d8ca6265d3f18e6d39f0 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -86,10 +86,16 @@ option will have no effect until you restart Emacs."
                 (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)