From b010e1bafc67c58eff793c24fea0d113fd03e23b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 10 Nov 2010 19:48:46 -0800 Subject: [PATCH] Fix some ls-lisp oddness. * lisp/ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias. --- lisp/ChangeLog | 4 ++++ lisp/ls-lisp.el | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bcaa0494706..cefe89ab338 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-11-11 Glenn Morris + + * ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias. + 2010-11-10 Glenn Morris * printing.el (pr-menu-bind): Doc fix. diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index b01ad6f9510..c7023add59b 100644 --- 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) -- 2.39.2