[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100197: Fix some ls-lisp oddness.

[Glenn Morris]

------------------------------------------------------------
revno: 100197
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-11-10 19:48:46 -0800
message:
  Fix some ls-lisp oddness.
  * lisp/ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
modified:
  lisp/ChangeLog
  lisp/ls-lisp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-10 07:55:15 +0000
+++ b/lisp/ChangeLog    2010-11-11 03:48:46 +0000
@@ -1,3 +1,7 @@
+2010-11-11  Glenn Morris  <address@hidden>
+
+       * ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
+
 2010-11-10  Glenn Morris  <address@hidden>
 
        * printing.el (pr-menu-bind): Doc fix.

=== modified file 'lisp/ls-lisp.el'
--- a/lisp/ls-lisp.el   2010-11-06 10:08:33 +0000
+++ b/lisp/ls-lisp.el   2010-11-11 03:48:46 +0000
@@ -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)