diff options
| author | John Wiegley | 2002-08-05 20:09:37 +0000 |
|---|---|---|
| committer | John Wiegley | 2002-08-05 20:09:37 +0000 |
| commit | a5c41f64a15a2c4f029f157f7dac6b2a87e27fbc (patch) | |
| tree | fd5add8e3f55ef98931aaa9ead09bbea33da8901 | |
| parent | 851988cd895db893330f3a1269d6ff6f863fcec3 (diff) | |
| download | emacs-a5c41f64a15a2c4f029f157f7dac6b2a87e27fbc.tar.gz emacs-a5c41f64a15a2c4f029f157f7dac6b2a87e27fbc.zip | |
Added checks that distinguish between cygwin and windows in some
places.
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/eshell/em-cmpl.el | 3 | ||||
| -rw-r--r-- | lisp/eshell/em-dirs.el | 3 | ||||
| -rw-r--r-- | lisp/eshell/em-glob.el | 3 | ||||
| -rw-r--r-- | lisp/eshell/em-hist.el | 3 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2002-08-05 John Wiegley <johnw@gnu.org> | ||
| 2 | |||
| 3 | * pcomplete.el (pcomplete-entries): Don't set `above-cutoff' to a | ||
| 4 | value unless pcomplete-cycle-cutoff-length is non-nil. | ||
| 5 | |||
| 6 | 2002-04-09 John Paul Wallington <jpw@shootybangbang.com> | ||
| 7 | |||
| 8 | * esh-util.el (eshell-under-cygwin-p): New function. | ||
| 9 | * em-cmpl.el (eshell-cmpl-ignore-case): Use it. | ||
| 10 | * em-dirs.el (eshell/cd): Ditto. | ||
| 11 | * em-glob.el (eshell-glob-case-insensitive): Ditto. | ||
| 12 | * em-hist.el (eshell-previous-matching-input-string-position): Ditto. | ||
| 13 | * esh-ext.el (eshell-binary-suffixes): Ditto. | ||
| 14 | |||
| 1 | 2002-08-05 Richard M. Stallman <rms@gnu.org> | 15 | 2002-08-05 Richard M. Stallman <rms@gnu.org> |
| 2 | 16 | ||
| 3 | * international/mule-cmds.el (select-safe-coding-system): Check for | 17 | * 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." | |||
| 142 | :type (get 'pcomplete-dir-ignore 'custom-type) | 142 | :type (get 'pcomplete-dir-ignore 'custom-type) |
| 143 | :group 'eshell-cmpl) | 143 | :group 'eshell-cmpl) |
| 144 | 144 | ||
| 145 | (defcustom eshell-cmpl-ignore-case (eshell-under-windows-p) | 145 | (defcustom eshell-cmpl-ignore-case (or (eshell-under-windows-p) |
| 146 | (eshell-under-cygwin-p)) | ||
| 146 | (documentation-property 'pcomplete-ignore-case | 147 | (documentation-property 'pcomplete-ignore-case |
| 147 | 'variable-documentation) | 148 | 'variable-documentation) |
| 148 | :type (get 'pcomplete-ignore-case 'custom-type) | 149 | :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: | |||
| 353 | (setq args (eshell-flatten-list args)) | 353 | (setq args (eshell-flatten-list args)) |
| 354 | (let ((path (car args)) | 354 | (let ((path (car args)) |
| 355 | (subpath (car (cdr args))) | 355 | (subpath (car (cdr args))) |
| 356 | (case-fold-search (eshell-under-windows-p)) | 356 | (case-fold-search (or (eshell-under-windows-p) |
| 357 | (eshell-under-cygwin-p))) | ||
| 357 | handled) | 358 | handled) |
| 358 | (if (numberp path) | 359 | (if (numberp path) |
| 359 | (setq path (number-to-string path))) | 360 | (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." | |||
| 76 | :type 'boolean | 76 | :type 'boolean |
| 77 | :group 'eshell-glob) | 77 | :group 'eshell-glob) |
| 78 | 78 | ||
| 79 | (defcustom eshell-glob-case-insensitive (eshell-under-windows-p) | 79 | (defcustom eshell-glob-case-insensitive (or (eshell-under-windows-p) |
| 80 | (eshell-under-cygwin-p)) | ||
| 80 | "*If non-nil, glob pattern matching will ignore case." | 81 | "*If non-nil, glob pattern matching will ignore case." |
| 81 | :type 'boolean | 82 | :type 'boolean |
| 82 | :group 'eshell-glob) | 83 | :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'." | |||
| 805 | (motion (if (> arg 0) 1 -1)) | 805 | (motion (if (> arg 0) 1 -1)) |
| 806 | (n (mod (- (or start (eshell-search-start arg)) motion) len)) | 806 | (n (mod (- (or start (eshell-search-start arg)) motion) len)) |
| 807 | (tried-each-ring-item nil) | 807 | (tried-each-ring-item nil) |
| 808 | (case-fold-search (eshell-under-windows-p)) | 808 | (case-fold-search (or (eshell-under-windows-p) |
| 809 | (eshell-under-cygwin-p))) | ||
| 809 | (prev nil)) | 810 | (prev nil)) |
| 810 | ;; Do the whole search as many times as the argument says. | 811 | ;; Do the whole search as many times as the argument says. |
| 811 | (while (and (/= arg 0) (not tried-each-ring-item)) | 812 | (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'." | |||
| 146 | "Return non-nil if we are running under MS-DOS/Windows." | 146 | "Return non-nil if we are running under MS-DOS/Windows." |
| 147 | (memq system-type '(ms-dos windows-nt))) | 147 | (memq system-type '(ms-dos windows-nt))) |
| 148 | 148 | ||
| 149 | (defsubst eshell-under-cygwin-p () | ||
| 150 | "Return non-nil if we are running under Cygwin." | ||
| 151 | (eq system-type 'cygwin32)) | ||
| 152 | |||
| 149 | (defmacro eshell-condition-case (tag form &rest handlers) | 153 | (defmacro eshell-condition-case (tag form &rest handlers) |
| 150 | "Like `condition-case', but only if `eshell-pass-through-errors' is nil." | 154 | "Like `condition-case', but only if `eshell-pass-through-errors' is nil." |
| 151 | (if eshell-handle-errors | 155 | (if eshell-handle-errors |