diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-17 22:54:14 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-17 22:54:14 -0500 |
| commit | 4a47c2757309e338321da1e7a2f6d399a306ce7d (patch) | |
| tree | de441bac2c90c3302459c5f0ffe9c53ec4b31c2f /lisp/ls-lisp.el | |
| parent | 8bbb7dd8a6d08540a81a7a2baa2274d8e6d65c92 (diff) | |
| parent | b916cbefa481920a49eac03c7025693f38afc882 (diff) | |
| download | emacs-4a47c2757309e338321da1e7a2f6d399a306ce7d.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/ls-lisp.el')
| -rw-r--r-- | lisp/ls-lisp.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 5f76c1bab7f..58ed6685dc2 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -103,10 +103,16 @@ update the dependent variables." (ls-lisp-set-options))) :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." :set-after '(ls-lisp-emulation) :type 'boolean |