From a5c41f64a15a2c4f029f157f7dac6b2a87e27fbc Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 5 Aug 2002 20:09:37 +0000 Subject: [PATCH] Added checks that distinguish between cygwin and windows in some places. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/eshell/em-cmpl.el | 3 ++- lisp/eshell/em-dirs.el | 3 ++- lisp/eshell/em-glob.el | 3 ++- lisp/eshell/em-hist.el | 3 ++- lisp/eshell/esh-util.el | 4 ++++ 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bad33809925..c85555e01bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2002-08-05 John Wiegley + + * pcomplete.el (pcomplete-entries): Don't set `above-cutoff' to a + value unless pcomplete-cycle-cutoff-length is non-nil. + +2002-04-09 John Paul Wallington + + * esh-util.el (eshell-under-cygwin-p): New function. + * em-cmpl.el (eshell-cmpl-ignore-case): Use it. + * em-dirs.el (eshell/cd): Ditto. + * em-glob.el (eshell-glob-case-insensitive): Ditto. + * em-hist.el (eshell-previous-matching-input-string-position): Ditto. + * esh-ext.el (eshell-binary-suffixes): Ditto. + 2002-08-05 Richard M. Stallman * international/mule-cmds.el (select-safe-coding-system): Check for diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index ac93223bd57..09c6e784f9e 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -142,7 +142,8 @@ to writing a completion function." :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) diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 2838ec5e8bf..1d078196ec0 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -353,7 +353,8 @@ in the minibuffer: (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))) diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 9d5f8bc3adc..09c65dfd7d6 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -76,7 +76,8 @@ by zsh for filename generation." :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) diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 468e938e326..4da335cc100 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -805,7 +805,8 @@ Moves relative to START, or `eshell-history-index'." (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)) diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index ef4bcda31a0..dae9655aff7 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -146,6 +146,10 @@ function `string-to-number'." "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 -- 2.39.2