Mercurial > emacs
changeset 46820:543b32b4673d
Added checks that distinguish between cygwin and windows in some
places.
| author | John Wiegley <johnw@newartisans.com> |
|---|---|
| date | Mon, 05 Aug 2002 20:09:16 +0000 |
| parents | acd6b7b35363 |
| children | 3dfc781fcf63 |
| files | lisp/eshell/em-cmpl.el lisp/eshell/em-dirs.el lisp/eshell/em-glob.el lisp/eshell/em-hist.el lisp/eshell/esh-util.el |
| diffstat | 5 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/eshell/em-cmpl.el Mon Aug 05 20:08:40 2002 +0000 +++ b/lisp/eshell/em-cmpl.el Mon Aug 05 20:09:16 2002 +0000 @@ -142,7 +142,8 @@ :type (get 'pcomplete-dir-ignore 'custom-type) :group 'eshell-cmpl) -(defcustom eshell-cmpl-ignore-case (eshell-under-windows-p) +(defcustom eshell-cmpl-ignore-case (or (eshell-under-windows-p) + (eshell-under-cygwin-p)) (documentation-property 'pcomplete-ignore-case 'variable-documentation) :type (get 'pcomplete-ignore-case 'custom-type)
--- a/lisp/eshell/em-dirs.el Mon Aug 05 20:08:40 2002 +0000 +++ b/lisp/eshell/em-dirs.el Mon Aug 05 20:09:16 2002 +0000 @@ -353,7 +353,8 @@ (setq args (eshell-flatten-list args)) (let ((path (car args)) (subpath (car (cdr args))) - (case-fold-search (eshell-under-windows-p)) + (case-fold-search (or (eshell-under-windows-p) + (eshell-under-cygwin-p))) handled) (if (numberp path) (setq path (number-to-string path)))
--- a/lisp/eshell/em-glob.el Mon Aug 05 20:08:40 2002 +0000 +++ b/lisp/eshell/em-glob.el Mon Aug 05 20:09:16 2002 +0000 @@ -76,7 +76,8 @@ :type 'boolean :group 'eshell-glob) -(defcustom eshell-glob-case-insensitive (eshell-under-windows-p) +(defcustom eshell-glob-case-insensitive (or (eshell-under-windows-p) + (eshell-under-cygwin-p)) "*If non-nil, glob pattern matching will ignore case." :type 'boolean :group 'eshell-glob)
--- a/lisp/eshell/em-hist.el Mon Aug 05 20:08:40 2002 +0000 +++ b/lisp/eshell/em-hist.el Mon Aug 05 20:09:16 2002 +0000 @@ -805,7 +805,8 @@ (motion (if (> arg 0) 1 -1)) (n (mod (- (or start (eshell-search-start arg)) motion) len)) (tried-each-ring-item nil) - (case-fold-search (eshell-under-windows-p)) + (case-fold-search (or (eshell-under-windows-p) + (eshell-under-cygwin-p))) (prev nil)) ;; Do the whole search as many times as the argument says. (while (and (/= arg 0) (not tried-each-ring-item))
--- a/lisp/eshell/esh-util.el Mon Aug 05 20:08:40 2002 +0000 +++ b/lisp/eshell/esh-util.el Mon Aug 05 20:09:16 2002 +0000 @@ -146,6 +146,10 @@ "Return non-nil if we are running under MS-DOS/Windows." (memq system-type '(ms-dos windows-nt))) +(defsubst eshell-under-cygwin-p () + "Return non-nil if we are running under Cygwin." + (eq system-type 'cygwin32)) + (defmacro eshell-condition-case (tag form &rest handlers) "Like `condition-case', but only if `eshell-pass-through-errors' is nil." (if eshell-handle-errors