diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 18 | ||||
-rw-r--r-- | lisp/comint.el | 8 | ||||
-rw-r--r-- | lisp/dired-aux.el | 2 | ||||
-rw-r--r-- | lisp/dired.el | 22 | ||||
-rw-r--r-- | lisp/dirtrack.el | 74 | ||||
-rw-r--r-- | lisp/dos-w32.el | 2 | ||||
-rw-r--r-- | lisp/fast-lock.el | 10 | ||||
-rw-r--r-- | lisp/filecache.el | 6 | ||||
-rw-r--r-- | lisp/files.el | 14 | ||||
-rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
-rw-r--r-- | lisp/gnus/nnheader.el | 6 | ||||
-rw-r--r-- | lisp/hippie-exp.el | 128 | ||||
-rw-r--r-- | lisp/international/mule.el | 2 | ||||
-rw-r--r-- | lisp/net/browse-url.el | 6 | ||||
-rw-r--r-- | lisp/pcomplete.el | 2 | ||||
-rw-r--r-- | lisp/recentf.el | 10 | ||||
-rw-r--r-- | lisp/shell.el | 2 | ||||
-rw-r--r-- | lisp/woman.el | 2 |
18 files changed, 171 insertions, 147 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c54bba61af..45dae9f96dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2003-01-31 Joe Buehler <jhpb@draco.hekimian.com> + + * comint.el: + * dired-aux.el: + * dired.el: + * dirtrack.el: + * dos-w32.el: + * fast-lock.el: + * filecache.el: + * files.el: + * hippie-exp.el: + * international/mule.el: + * net/browse-url.el: + * pcomplete.el: + * recentf.el: + * shell.el: + * woman.el: Added cygwin to system-type comparisons. + 2003-01-31 Francesco Potort,Al(B <pot@gnu.org> * mail/undigest.el (rmail-forward-separator-regex): New custom diff --git a/lisp/comint.el b/lisp/comint.el index 0577d96a61e..126f05b1a79 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2536,7 +2536,7 @@ This is used by comint's and shell's completion functions, and by shell's directory tracking functions.") (defvar comint-file-name-chars - (if (memq system-type '(ms-dos windows-nt)) + (if (memq system-type '(ms-dos windows-nt cygwin)) "~/A-Za-z0-9_^$!#%&{}@`'.,:()-" "~/A-Za-z0-9+@:_.$#%,={}-") "String of characters valid in a file name. @@ -2661,7 +2661,7 @@ Returns t if successful." (defun comint-dynamic-complete-as-filename () "Dynamically complete at point as a filename. See `comint-dynamic-complete-filename'. Returns t if successful." - (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt))) + (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin))) (completion-ignored-extensions comint-completion-fignore) ;; If we bind this, it breaks remote directory tracking in rlogin.el. ;; I think it was originally bound to solve file completion problems, @@ -2750,7 +2750,7 @@ Returns `partial' if completed as far as possible with the completion matches. Returns `listed' if a completion listing was shown. See also `comint-dynamic-complete-filename'." - (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt))) + (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin))) (suffix (cond ((not comint-completion-addsuffix) "") ((not (consp comint-completion-addsuffix)) " ") (t (cdr comint-completion-addsuffix)))) @@ -2791,7 +2791,7 @@ See also `comint-dynamic-complete-filename'." (defun comint-dynamic-list-filename-completions () "List in help buffer possible completions of the filename at point." (interactive) - (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt))) + (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin))) ;; If we bind this, it breaks remote directory tracking in rlogin.el. ;; I think it was originally bound to solve file completion problems, ;; but subsequent changes may have made this unnecessary. sm. diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 70e14730bd3..ca6f12e0fc7 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1258,7 +1258,7 @@ Optional arg HOW-TO is used to set the value of the into-dir variable ;; will return t because the filesystem is ;; case-insensitive, and Emacs will try to move ;; foo -> foo/foo, which fails. - (if (and (memq system-type '(ms-dos windows-nt)) + (if (and (memq system-type '(ms-dos windows-nt cygwin)) (eq op-symbol 'move) dired-one-file (string= (downcase diff --git a/lisp/dired.el b/lisp/dired.el index c504e7a1185..d658960a35e 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -65,7 +65,7 @@ some of the `ls' switches are not supported; see the doc string of ;;;###autoload (defvar dired-chown-program - (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux)) + (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux cygwin)) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" @@ -299,7 +299,7 @@ Subexpression 2 must end right before the \\n or \\r.") '(".+" (dired-move-to-filename) nil (0 font-lock-function-name-face))) ;; ;; Symbolic links. - (list dired-re-sym + (list dired-re-sym '(".+" (dired-move-to-filename) nil (0 font-lock-keyword-face))) ;; ;; Files suffixed with `completion-ignored-extensions'. @@ -530,11 +530,11 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh." (setq buffer (create-file-buffer (directory-file-name dirname))))) (set-buffer buffer) (if (not new-buffer-p) ; existing buffer ... - (cond (switches ; ... but new switches + (cond (switches ; ... but new switches ;; file list may have changed (setq dired-directory dir-or-list) ;; this calls dired-revert - (dired-sort-other switches)) + (dired-sort-other switches)) ;; If directory has changed on disk, offer to revert. ((if (let ((attributes (file-attributes dirname)) (modtime (visited-file-modtime))) @@ -1769,7 +1769,7 @@ You can then feed the file name(s) to other commands with \\[yank]." (substring pattern matched-in-pattern)) "\\'"))) - + (defun dired-advertise () ;;"Advertise in variable `dired-buffers' that we dired `default-directory'." @@ -2053,7 +2053,7 @@ Anything else means ask for each directory." (const :tag "Confirm for each top directory only" top)) :group 'dired) -;; Match anything but `.' and `..'. +;; Match anything but `.' and `..'. (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*") ;; Delete file, possibly delete a directory and all its files. @@ -2174,7 +2174,7 @@ if there are no flagged files." (setq success-list (cons (buffer-name buf) success-list))))) success-list)) -;; Delete the entry for FILE from +;; Delete the entry for FILE from (defun dired-delete-entry (file) (save-excursion (and (dired-goto-file file) @@ -2572,7 +2572,7 @@ A prefix argument says to unflag those files instead." (defvar dired-garbage-files-regexp (concat (regexp-opt '(".log" ".toc" ".dvi" ".bak" ".orig" ".rej" ".aux")) - "\\'") + "\\'") "*Regular expression to match \"garbage\" files for `dired-flag-garbage-files'.") (defun dired-flag-garbage-files () @@ -2632,7 +2632,7 @@ OLD and NEW are both characters used to mark files." (defun dired-unmark-all-files (mark &optional arg) "Remove a specific mark (or any mark) from every file. -After this command, type the mark character to remove, +After this command, type the mark character to remove, or type RET to remove all marks. With prefix arg, query for each marked file. Type \\[help-command] at that time for help." @@ -2683,7 +2683,7 @@ Thus, use \\[backward-page] to find the beginning of a group of errors." ;; Log a message or the contents of a buffer. ;; If LOG is a string and there are more args, it is formatted with ;; those ARGS. Usually the LOG string ends with a \n. - ;; End each bunch of errors with (dired-log t): + ;; End each bunch of errors with (dired-log t): ;; this inserts the current time and buffer at the start of the page, ;; and \f (formfeed) at the end. (let ((obuf (current-buffer))) @@ -3076,7 +3076,7 @@ Use \\[dired-hide-subdir] to (un)hide a particular subdirectory." (autoload 'dired-show-file-type "dired-aux" "Print the type of FILE, according to the `file' command. If FILE is a symbolic link and the optional argument DEREF-SYMLINKS is -true then the type of the file linked to by FILE is printed instead." +true then the type of the file linked to by FILE is printed instead." t) (autoload 'dired-run-shell-command "dired-aux") diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index 572435d357b..d8590f60add 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el @@ -5,7 +5,7 @@ ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Nov 17 1996 ;; Keywords: processes -;; Time-stamp: <1999-02-21 01:27:24 pbreton> +;; Time-stamp: <2003-01-31 16:15:05 jbarranquero> ;; This file is part of GNU Emacs. @@ -42,8 +42,8 @@ ;; 1) Set your shell's prompt to contain the current working directory. ;; You may need to consult your shell's documentation to find out how to ;; do this. -;; -;; Note that directory tracking is done by matching regular expressions, +;; +;; Note that directory tracking is done by matching regular expressions, ;; therefore it is *VERY IMPORTANT* for your prompt to be easily ;; distinguishable from other output. If your prompt regexp is too general, ;; you will see error messages from the dirtrack filter as it attempts to cd @@ -52,16 +52,16 @@ ;; 2) Set the variable `dirtrack-list' to an appropriate value. This ;; should be a list of two elements: the first is a regular expression ;; which matches your prompt up to and including the pathname part. -;; The second is a number which tells which regular expression group to +;; The second is a number which tells which regular expression group to ;; match to extract only the pathname. If you use a multi-line prompt, ;; add 't' as a third element. Note that some of the functions in ;; 'comint.el' assume a single-line prompt (eg, comint-bol). -;; +;; ;; Determining this information may take some experimentation. Setting ;; the variable `dirtrack-debug' may help; it causes the directory-tracking ;; filter to log messages to the buffer `dirtrack-debug-buffer'. You can easily ;; toggle this setting with the `dirtrack-debug-toggle' function. -;; +;; ;; 3) Add a hook to shell-mode to enable the directory tracking: ;; ;; (add-hook 'shell-mode-hook @@ -83,26 +83,26 @@ ;; 'dirtrack-list' is set to (list "^\\([/~].*\\)\nemacs@[^%]+% *" 1 t) ;; ;; I'd appreciate other examples from people who use this package. -;; +;; ;; Here's one from Stephen Eglen: ;; ;; Running under tcsh: ;; (setq-default dirtrack-list '("^%E \\([^ ]+\\)" 1)) -;; +;; ;; It might be worth mentioning in your file that emacs sources start up ;; files of the form: ~/.emacs_<SHELL> where <SHELL> is the name of the ;; shell. So for example, I have the following in ~/.emacs_tcsh: -;; +;; ;; set prompt = "%%E %~ %h% " -;; +;; ;; This produces a prompt of the form: -;; %E /var/spool 10% -;; +;; %E /var/spool 10% +;; ;; This saves me from having to use the %E prefix in other non-emacs ;; shells. ;; ;; A final note: -;; +;; ;; I run LOTS of shell buffers through Emacs, sometimes as different users ;; (eg, when logged in as myself, I'll run a root shell in the same Emacs). ;; If you do this, and the shell prompt contains a ~, Emacs will interpret @@ -134,11 +134,11 @@ (defcustom dirtrack-list (list "^emacs \\([a-zA-Z]:.*\\)>" 1) "*List for directory tracking. First item is a regexp that describes where to find the path in a prompt. -Second is a number, the regexp group to match. Optional third item is -whether the prompt is multi-line. If nil or omitted, prompt is assumed to +Second is a number, the regexp group to match. Optional third item is +whether the prompt is multi-line. If nil or omitted, prompt is assumed to be on a single line." :group 'dirtrack - :type '(sexp (regexp :tag "Prompt Expression") + :type '(sexp (regexp :tag "Prompt Expression") (integer :tag "Regexp Group") (boolean :tag "Multiline Prompt") ) @@ -166,8 +166,8 @@ be on a single line." (make-variable-buffer-local 'dirtrackp) -(defcustom dirtrack-directory-function - (if (memq system-type (list 'ms-dos 'windows-nt)) +(defcustom dirtrack-directory-function + (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) 'dirtrack-windows-directory-function 'dirtrack-default-directory-function) "*Function to apply to the prompt directory for comparison purposes." @@ -175,8 +175,8 @@ be on a single line." :type 'function ) -(defcustom dirtrack-canonicalize-function - (if (memq system-type (list 'ms-dos 'windows-nt)) +(defcustom dirtrack-canonicalize-function + (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) 'downcase 'identity) "*Function to apply to the default directory for comparison purposes." :group 'dirtrack @@ -204,7 +204,7 @@ Such a directory ends with a forward slash." (defun dirtrack-windows-directory-function (dir) "Return a canonical directory for comparison purposes. -Such a directory is all lowercase, has forward-slashes as delimiters, +Such a directory is all lowercase, has forward-slashes as delimiters, and ends with a forward slash." (let ((directory dir)) (setq directory (downcase (dirtrack-replace-slash directory t))) @@ -217,13 +217,13 @@ and ends with a forward slash." (defun dirtrack-replace-slash (string &optional opposite) "Replace forward slashes with backwards ones. -If additional argument is non-nil, replace backwards slashes with +If additional argument is non-nil, replace backwards slashes with forward ones." - (let ((orig (if opposite - dirtrack-backward-slash + (let ((orig (if opposite + dirtrack-backward-slash dirtrack-forward-slash)) - (replace (if opposite - dirtrack-forward-slash + (replace (if opposite + dirtrack-forward-slash dirtrack-backward-slash)) (newstring string) ) @@ -266,7 +266,7 @@ You can toggle directory tracking by using the function `dirtrack-toggle'. If directory tracking does not seem to be working, you can use the function `dirtrack-debug-toggle' to turn on debugging output. -You can enable directory tracking by adding this function to +You can enable directory tracking by adding this function to `comint-output-filter-functions'. " (if (null dirtrackp) @@ -286,33 +286,33 @@ You can enable directory tracking by adding this function to ;; No match (if (null matched) (and dirtrack-debug - (dirtrack-debug-message - (format - "Input `%s' failed to match regexp: %s" + (dirtrack-debug-message + (format + "Input `%s' failed to match regexp: %s" input dirtrack-regexp))) - (setq prompt-path + (setq prompt-path (substring input (match-beginning match-num) (match-end match-num))) ;; Empty string (if (not (> (length prompt-path) 0)) (and dirtrack-debug - (dirtrack-debug-message "Match is empty string")) + (dirtrack-debug-message "Match is empty string")) ;; Transform prompts into canonical forms (setq prompt-path (funcall dirtrack-directory-function prompt-path)) (setq current-dir (funcall dirtrack-canonicalize-function current-dir)) (and dirtrack-debug - (dirtrack-debug-message + (dirtrack-debug-message (format "Prompt is %s\nCurrent directory is %s" - prompt-path current-dir))) + prompt-path current-dir))) ;; Compare them (if (or (string= current-dir prompt-path) - (string= current-dir + (string= current-dir (abbreviate-file-name prompt-path))) (and dirtrack-debug - (dirtrack-debug-message + (dirtrack-debug-message (format "Not changing directory"))) ;; It's possible that Emacs will think the directory ;; won't exist (eg, rlogin buffers) @@ -321,7 +321,7 @@ You can enable directory tracking by adding this function to (and (shell-process-cd prompt-path) (run-hooks 'dirtrack-directory-change-hook) dirtrack-debug - (dirtrack-debug-message + (dirtrack-debug-message (format "Changing directory to %s" prompt-path))) (error "Directory %s does not exist" prompt-path))) ))))) diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 81aa9c28cd7..4768586b331 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -197,7 +197,7 @@ the directory prefix corresponding to the filesystem.") (defun untranslated-canonical-name (filename) "Return FILENAME in a canonicalized form for use with the functions dealing with untranslated filesystems." - (if (memq system-type '(ms-dos windows-nt)) + (if (memq system-type '(ms-dos windows-nt cygwin)) ;; The canonical form for DOS/W32 is with A-Z downcased and all ;; directory separators changed to directory-sep-char. (let ((name nil)) diff --git a/lisp/fast-lock.el b/lisp/fast-lock.el index 804b8df9245..c37a4adb192 100644 --- a/lisp/fast-lock.el +++ b/lisp/fast-lock.el @@ -34,7 +34,7 @@ ;; See also the lazy-lock package. (But don't use the two at the same time!) ;; Installation: -;; +;; ;; Put in your ~/.emacs: ;; ;; (setq font-lock-support-mode 'fast-lock-mode) @@ -67,7 +67,7 @@ ;; 1.01--2.00: complete rewrite---not worth the space to document ;; - Changed structure of text properties cache and threw out file mod checks ;; 2.00--2.01: -;; - Made `condition-case' forms understand `quit'. +;; - Made `condition-case' forms understand `quit'. ;; - Made `fast-lock' require `font-lock' ;; - Made `fast-lock-cache-name' chase links (from Ben Liblit) ;; 2.01--3.00: @@ -230,7 +230,7 @@ ;; ;; We use this for compatibility with a future Emacs. (or (fboundp 'defcustom) - (defmacro defcustom (symbol value doc &rest args) + (defmacro defcustom (symbol value doc &rest args) `(defvar ,symbol ,value ,doc)))) ;(defun fast-lock-submit-bug-report () @@ -553,7 +553,7 @@ See `fast-lock-cache-directory'." (concat buffer-file-name ".flc") (let* ((bufile (expand-file-name buffer-file-truename)) (chars-alist - (if (memq system-type '(emx windows-nt)) + (if (memq system-type '(emx windows-nt cygwin)) '((?/ . (?#)) (?# . (?# ?#)) (?: . (?\;)) (?\; . (?\; ?\;))) '((?/ . (?#)) (?# . (?# ?#))))) (mapchars @@ -807,7 +807,7 @@ See `fast-lock-get-face-properties'." (font-lock-set-face (nth 0 regions) (nth 1 regions) face) (setq regions (nthcdr 2 regions))) (setq face-properties (cdr face-properties)))) - ;; XEmacs does not support the `syntax-table' text property. + ;; XEmacs does not support the `syntax-table' text property. )) ;; ;; XEmacs 19.12 font-lock.el's `font-lock-fontify-buffer' runs a hook. diff --git a/lisp/filecache.el b/lisp/filecache.el index 72ef62fc650..4cc259bf9f6 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -187,7 +187,7 @@ do not use this variable." :group 'file-cache) (defcustom file-cache-completion-ignore-case - (if (memq system-type (list 'ms-dos 'windows-nt)) + (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) t completion-ignore-case) "If non-nil, file-cache completion should ignore case. @@ -197,7 +197,7 @@ Defaults to the value of `completion-ignore-case'." ) (defcustom file-cache-case-fold-search - (if (memq system-type (list 'ms-dos 'windows-nt)) + (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) t case-fold-search) "If non-nil, file-cache completion should ignore case. @@ -207,7 +207,7 @@ Defaults to the value of `case-fold-search'." ) (defcustom file-cache-assoc-function - (if (memq system-type (list 'ms-dos 'windows-nt)) + (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) 'assoc-ignore-case 'assoc) "Function to use to check completions in the file cache. diff --git a/lisp/files.el b/lisp/files.el index 8a801a3d530..cb1e0156ed3 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -215,7 +215,7 @@ have fast storage with limited space, such as a RAM disk." "[\000-\031]\\|" ; control characters "\\(/\\.\\.?[^/]\\)\\|" ; leading dots "\\(/[^/.]+\\.[^/.]*\\.\\)")) ; more than a single dot - ((memq system-type '(ms-dos windows-nt)) + ((memq system-type '(ms-dos windows-nt cygwin)) (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive "[|<>\"?*\000-\031]")) ; invalid characters (t "[\000]")) @@ -1028,6 +1028,7 @@ Type \\[describe-variable] directory-abbrev-alist RET for more information." ;; MS-DOS root directories can come with a drive letter; ;; Novell Netware allows drive letters beyond `Z:'. (not (and (or (eq system-type 'ms-dos) + (eq system-type 'cygwin) (eq system-type 'windows-nt)) (save-match-data (string-match "^[a-zA-`]:/$" filename))))) @@ -1774,7 +1775,7 @@ and we don't even do that unless it would come from the file name." (mode nil)) ;; Find first matching alist entry. (let ((case-fold-search - (memq system-type '(vax-vms windows-nt)))) + (memq system-type '(vax-vms windows-nt cygwin)))) (while (and (not mode) alist) (if (string-match (car (car alist)) name) (if (and (consp (cdr (car alist))) @@ -2615,7 +2616,7 @@ doesn't exist, it is created." file (if (file-name-absolute-p backup-directory) (progn - (when (memq system-type '(windows-nt ms-dos)) + (when (memq system-type '(windows-nt ms-dos cygwin)) ;; Normalize DOSish file names: downcase the drive ;; letter, if any, and replace the leading "x:" with ;; "/drive_x". @@ -2737,6 +2738,7 @@ then it returns FILENAME." ;; On Microsoft OSes, if FILENAME and DIRECTORY have different ;; drive names, they can't be relative, so return the absolute name. (if (and (or (eq system-type 'ms-dos) + (eq system-type 'cygwin) (eq system-type 'windows-nt)) (not (string-equal (substring fname 0 2) (substring directory 0 2)))) @@ -3136,7 +3138,7 @@ prints a message in the minibuffer. Instead, use `set-buffer-modified-p'." With arg, set read-only iff arg is positive. If visiting file read-only and `view-read-only' is non-nil, enter view mode." (interactive "P") - (if (and arg + (if (and arg (if (> (prefix-numeric-value arg) 0) buffer-read-only (not buffer-read-only))) ; If buffer-read-only is set correctly, nil ; do nothing. @@ -3881,7 +3883,7 @@ Existing quote characters in PATTERN are left alone, so you can pass PATTERN that already quotes some of the special characters." (save-match-data (cond - ((memq system-type '(ms-dos windows-nt)) + ((memq system-type '(ms-dos windows-nt cygwin)) ;; DOS/Windows don't allow `"' in file names. So if the ;; argument has quotes, we can safely assume it is already ;; quoted by the caller. @@ -4022,7 +4024,7 @@ If WILDCARD, it also runs the shell specified by `shell-file-name'." ;; bunch by one to preserve that property. (coding-system-for-read 'no-conversion) ;; This is to control encoding the arguments in call-process. - (coding-system-for-write + (coding-system-for-write (and enable-multibyte-characters (or file-name-coding-system default-file-name-coding-system)))) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e57878b6e66..f5198d5eea1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2003-01-31 Joe Buehler <jhpb@draco.hekimian.com> + + * nnheader.el: Added cygwin to system-type comparisons. + 2003-01-27 Juanma Barranquero <lektu@terra.es> * imap.el (imap-mailbox-status): Fix typo. diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index 9fee7b776c5..53ab2d88ebb 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el @@ -47,7 +47,7 @@ (defvar nnheader-head-chop-length 2048 "*Length of each read operation when trying to fetch HEAD headers.") -(defvar nnheader-file-name-translation-alist +(defvar nnheader-file-name-translation-alist (let ((case-fold-search t)) (cond ((string-match "windows-nt\\|os/2\\|emx\\|cygwin32" @@ -653,12 +653,12 @@ If FULL, translate everything." ;; We translate -- but only the file name. We leave the directory ;; alone. (if (and (featurep 'xemacs) - (memq system-type '(win32 w32 mswindows windows-nt))) + (memq system-type '(win32 w32 mswindows windows-nt cygwin))) ;; This is needed on NT and stuff, because ;; file-name-nondirectory is not enough to split ;; file names, containing ':', e.g. ;; "d:\\Work\\News\\nntp+news.fido7.ru:fido7.ru.gnu.SCORE" - ;; + ;; ;; we are trying to correctly split such names: ;; "d:file.name" -> "a:" "file.name" ;; "aaa:bbb.ccc" -> "" "aaa:bbb.ccc" diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index ba53e3a086c..499e99352e2 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -28,7 +28,7 @@ ;; `hippie-expand' is a single function for a lot of different kinds ;; of completions and expansions. Called repeatedly it tries all -;; possible completions in succession. +;; possible completions in succession. ;; Which kinds of completions to try, and in which order, is ;; determined by the contents of `hippie-expand-try-functions-list'. ;; Much customization of `hippie-expand' can be made by changing the @@ -61,7 +61,7 @@ ;; characters of syntax '_' is considered part of the words to expand ;; dynamically. ;; See also the macro `make-hippie-expand-function' below. -;; +;; ;; A short description of the current try-functions in this file: ;; `try-complete-file-name' : very convenient to have in any buffer, ;; and not just in the minibuffer or (some) shell-mode. It goes @@ -72,9 +72,9 @@ ;; a file name completed only as many characters as is unique. ;; `try-expand-all-abbrevs' : can be removed if you don't use abbrevs. ;; Otherwise it looks through all abbrev-tables, starting with -;; the local followed by the global. -;; `try-expand-line' : Searches the buffer for an entire line that -;; begins exactly as the current line. Convenient sometimes, for +;; the local followed by the global. +;; `try-expand-line' : Searches the buffer for an entire line that +;; begins exactly as the current line. Convenient sometimes, for ;; example as a substitute for (or complement to) the history ;; list in shell-like buffers. At other times, only confusing. ;; `try-expand-line-all-buffers' : Like `try-expand-line' but searches @@ -83,14 +83,14 @@ ;; `try-expand-list' : Tries to expand the text back to the nearest ;; open delimiter, to a whole list from the buffer. Convenient for ;; example when writing lisp or TeX. -;; `try-expand-list-all-buffers' : Like `try-expand-list' but searches -;; in all buffers (except the current). +;; `try-expand-list-all-buffers' : Like `try-expand-list' but searches +;; in all buffers (except the current). ;; `try-expand-dabbrev' : works exactly as dabbrev-expand (but of ;; course in a way compatible with the other try-functions). ;; `try-expand-dabbrev-all-buffers' : perhaps the most useful of them, ;; like `dabbrev-expand' but searches all Emacs buffers (except the ;; current) for matching words. (No, I don't find this one -;; particularly slow.) +;; particularly slow.) ;; `try-expand-dabbrev-visible': Searches the currently visible parts of ;; all windows. Can be put before `try-expand-dabbrev-all-buffers' to ;; first try the expansions you can see. @@ -108,7 +108,7 @@ ;; already has a key of its own, you might want to remove this. ;; `try-complete-lisp-symbol-partially' : To insert in the list just ;; before `try-complete-lisp-symbol' for those who first want to get -;; completion of what is unique in the name. +;; completion of what is unique in the name. ;; ;; Not all of the above functions are by default in ;; `hippie-expand-try-functions-list'. This variable is better set @@ -143,14 +143,14 @@ ;; `he-reset-string' : Resets the initialized region to its original ;; contents. ;; There is also a variable: `he-tried-table' which is meant to contain -;; all tried expansions so far. The try-function can check this +;; all tried expansions so far. The try-function can check this ;; variable to see whether an expansion has already been tried ;; (hint: `he-string-member'). ;; ;; Known bugs ;; ;; It may happen that some completion suggestion occurs twice, in -;; spite of the use of `he-tried-table' to prevent that. This is +;; spite of the use of `he-tried-table' to prevent that. This is ;; because different try-functions may try to complete different ;; lengths of text, and thus put different amounts of the ;; text in `he-tried-table'. Anyway this seems to occur seldom enough @@ -274,12 +274,12 @@ Can contain both regexps matching buffer names (as strings) and major modes The expansion functions in `hippie-expand-try-functions-list' are tried in order, until a possible expansion is found. Repeated application of `hippie-expand' inserts successively possible -expansions. +expansions. With a positive numeric argument, jumps directly to the ARG next -function in this list. With a negative argument or just \\[universal-argument], -undoes the expansion." +function in this list. With a negative argument or just \\[universal-argument], +undoes the expansion." (interactive "P") - (if (or (not arg) + (if (or (not arg) (and (integerp arg) (> arg 0))) (let ((first (or (= he-num -1) (not (equal this-command last-command))))) @@ -292,7 +292,7 @@ undoes the expansion." (setq arg 0)) (let ((i (max (+ he-num arg) 0))) (while (not (or (>= i (length hippie-expand-try-functions-list)) - (apply (nth i hippie-expand-try-functions-list) + (apply (nth i hippie-expand-try-functions-list) (list (= he-num i))))) (setq i (1+ i))) (setq he-num i)) @@ -331,7 +331,7 @@ undoes the expansion." (goto-char newpos))) ;; Substitutes an expansion STR into the correct region (the region -;; initialized with `he-init-string'). +;; initialized with `he-init-string'). ;; An optional argument TRANS-CASE means that it is ok to transfer case ;; from the abbreviation to the expansion if that is possible, and is ;; enabled in the buffer. @@ -413,14 +413,14 @@ undoes the expansion." ;; (fset 'my-complete-line (make-hippie-expand-function ;; '(try-expand-line ;; try-expand-line-all-buffers))) -;; +;; ;;;###autoload (defmacro make-hippie-expand-function (try-list &optional verbose) "Construct a function similar to `hippie-expand'. Make it use the expansion functions in TRY-LIST. An optional second argument VERBOSE non-nil makes the function verbose." `(function (lambda (arg) - ,(concat + ,(concat "Try to expand text before point, using the following functions: \n" (mapconcat 'prin1-to-string (eval try-list) ", ")) (interactive "P") @@ -438,7 +438,7 @@ The argument OLD has to be nil the first call of this function, and t for subsequent calls (for further possible completions of the same string). It returns t if a new completion is found, nil otherwise." (if (not old) - (progn + (progn (he-init-string (he-file-name-beg) (point)) (let ((name-part (he-file-name-nondirectory he-search-string)) (dir-part (expand-file-name (or (he-file-name-directory @@ -447,7 +447,7 @@ string). It returns t if a new completion is found, nil otherwise." (setq he-tried-table (cons name-part he-tried-table))) (if (and (not (equal he-search-string "")) (he-file-directory-p dir-part)) - (setq he-expand-list (sort (file-name-all-completions + (setq he-expand-list (sort (file-name-all-completions name-part dir-part) 'string-lessp)) @@ -471,11 +471,11 @@ string). It returns t if a new completion is found, nil otherwise." (defun try-complete-file-name-partially (old) "Try to complete text as a file name, as many characters as unique. The argument OLD has to be nil the first call of this function. It -returns t if a unique, possibly partial, completion is found, nil +returns t if a unique, possibly partial, completion is found, nil otherwise." (let ((expansion ())) (if (not old) - (progn + (progn (he-init-string (he-file-name-beg) (point)) (let ((name-part (he-file-name-nondirectory he-search-string)) (dir-part (expand-file-name (or (he-file-name-directory @@ -503,7 +503,7 @@ otherwise." (defvar he-file-name-chars (cond ((memq system-type '(vax-vms axp-vms)) "-a-zA-Z0-9_/.,~^#$+=:\\[\\]") - ((memq system-type '(ms-dos windows-nt)) + ((memq system-type '(ms-dos windows-nt cygwin)) "-a-zA-Z0-9_/.,~^#$+=:\\\\") (t ;; More strange file formats ? "-a-zA-Z0-9_/.,~^#$+=")) @@ -518,7 +518,7 @@ otherwise." (point))))) ;; Thanks go to Richard Levitte <levitte@e.kth.se> who helped to make these -;; work under VMS, and to David Hughes <ukchugd@ukpmr.cs.philips.nl> who +;; work under VMS, and to David Hughes <ukchugd@ukpmr.cs.philips.nl> who ;; helped to make it work on PC. (defun he-file-name-nondirectory (file) "Fix to make `file-name-nondirectory' work for hippie-expand under VMS." @@ -545,7 +545,7 @@ otherwise." (or (file-directory-p file) (file-directory-p (concat file "[000000]"))) (file-directory-p file))) - + (defun he-concat-directory-file-name (dir-part name-part) "Try to slam together two parts of a file specification, system dependently." (cond ((null dir-part) name-part) @@ -560,20 +560,20 @@ otherwise." (= (aref name-part (1- (length name-part))) ?/)) (aset name-part (1- (length name-part)) ?\\)) (concat dir-part name-part)) - (t + (t (concat dir-part name-part)))) - + (defun try-complete-lisp-symbol (old) "Try to complete word as an Emacs Lisp symbol. The argument OLD has to be nil the first call of this function, and t for subsequent calls (for further possible completions of the same string). It returns t if a new completion is found, nil otherwise." (if (not old) - (progn + (progn (he-init-string (he-lisp-symbol-beg) (point)) (if (not (he-string-member he-search-string he-tried-table)) (setq he-tried-table (cons he-search-string he-tried-table))) - (setq he-expand-list + (setq he-expand-list (and (not (equal he-search-string "")) (sort (all-completions he-search-string obarray (function (lambda (sym) @@ -596,14 +596,14 @@ string). It returns t if a new completion is found, nil otherwise." (defun try-complete-lisp-symbol-partially (old) "Try to complete as an Emacs Lisp symbol, as many characters as unique. The argument OLD has to be nil the first call of this function. It -returns t if a unique, possibly partial, completion is found, nil +returns t if a unique, possibly partial, completion is found, nil otherwise." (let ((expansion ())) (if (not old) - (progn + (progn (he-init-string (he-lisp-symbol-beg) (point)) (if (not (string= he-search-string "")) - (setq expansion + (setq expansion (try-completion he-search-string obarray (function (lambda (sym) (or (boundp sym) @@ -649,7 +649,7 @@ string). It returns t if a new completion is found, nil otherwise." (widen)) ;; Try looking backward unless inhibited. (if he-search-bw - (progn + (progn (goto-char he-search-loc) (setq expansion (he-line-search he-search-string strip-prompt t)) @@ -660,9 +660,9 @@ string). It returns t if a new completion is found, nil otherwise." (setq he-search-bw ()))))) (if (not expansion) ; Then look forward. - (progn + (progn (goto-char he-search-loc) - (setq expansion (he-line-search he-search-string + (setq expansion (he-line-search he-search-string strip-prompt nil)) (set-marker he-search-loc (point))))))) @@ -693,7 +693,7 @@ string). It returns t if a new completion is found, nil otherwise." (set-marker he-search-loc 1 (car he-search-bufs)))) (if (not (equal he-search-string "")) - (while (and he-search-bufs + (while (and he-search-bufs (not expansion) (or (not hippie-expand-max-buffers) (< he-searched-n-bufs hippie-expand-max-buffers))) @@ -710,7 +710,7 @@ string). It returns t if a new completion is found, nil otherwise." (setq strip-prompt (and (get-buffer-process (current-buffer)) comint-use-prompt-regexp-instead-of-fields comint-prompt-regexp)) - (setq expansion + (setq expansion (let ((case-fold-search orig-case-fold-search)) (he-line-search he-search-string strip-prompt nil))) @@ -732,11 +732,11 @@ string). It returns t if a new completion is found, nil otherwise." (he-substitute-string expansion t) t)))) -(defun he-line-search (str strip-prompt reverse) +(defun he-line-search (str strip-prompt reverse) (let ((result ())) (while (and (not result) (if reverse - (re-search-backward + (re-search-backward (he-line-search-regexp str strip-prompt) nil t) (re-search-forward @@ -750,7 +750,7 @@ string). It returns t if a new completion is found, nil otherwise." (defun he-line-beg (strip-prompt) (save-excursion - (if (re-search-backward (he-line-search-regexp "" strip-prompt) + (if (re-search-backward (he-line-search-regexp "" strip-prompt) (save-excursion (beginning-of-line) (point)) t) (match-beginning 2) @@ -761,7 +761,7 @@ string). It returns t if a new completion is found, nil otherwise." (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\(" (regexp-quote pat) "[^\n]*[^ \t\n]\\)") - (concat "^\\(\\s-*\\)\\(" + (concat "^\\(\\s-*\\)\\(" (regexp-quote pat) "[^\n]*[^ \t\n]\\)"))) @@ -784,7 +784,7 @@ string). It returns t if a new completion is found, nil otherwise." (widen)) ;; Try looking backward unless inhibited. (if he-search-bw - (progn + (progn (goto-char he-search-loc) (setq expansion (he-list-search he-search-string t)) (set-marker he-search-loc (point)) @@ -794,7 +794,7 @@ string). It returns t if a new completion is found, nil otherwise." (setq he-search-bw ()))))) (if (not expansion) ; Then look forward. - (progn + (progn (goto-char he-search-loc) (setq expansion (he-list-search he-search-string nil)) (set-marker he-search-loc (point))))))) @@ -823,7 +823,7 @@ string). It returns t if a new completion is found, nil otherwise." (set-marker he-search-loc 1 (car he-search-bufs)))) (if (not (equal he-search-string "")) - (while (and he-search-bufs + (while (and he-search-bufs (not expansion) (or (not hippie-expand-max-buffers) (< he-searched-n-bufs hippie-expand-max-buffers))) @@ -837,7 +837,7 @@ string). It returns t if a new completion is found, nil otherwise." (if hippie-expand-no-restriction (widen)) (goto-char he-search-loc) - (setq expansion + (setq expansion (let ((case-fold-search orig-case-fold-search)) (he-list-search he-search-string nil))) (set-marker he-search-loc (point)) @@ -858,7 +858,7 @@ string). It returns t if a new completion is found, nil otherwise." (he-substitute-string expansion t) t)))) -(defun he-list-search (str reverse) +(defun he-list-search (str reverse) (let ((result ()) beg pos err) (while (and (not result) @@ -872,7 +872,7 @@ string). It returns t if a new completion is found, nil otherwise." (condition-case () (forward-list 1) (error (setq err t))) - (if (and reverse + (if (and reverse (> (point) he-string-beg)) (setq err t)) (if (not err) @@ -898,13 +898,13 @@ string). It returns t if a new expansion is found, nil otherwise." (if (not old) (progn (he-init-string (he-dabbrev-beg) (point)) - (setq he-expand-list + (setq he-expand-list (and (not (equal he-search-string "")) (mapcar (function (lambda (sym) (if (and (boundp sym) (vectorp (eval sym))) (abbrev-expansion (downcase he-search-string) (eval sym))))) - (append '(local-abbrev-table + (append '(local-abbrev-table global-abbrev-table) abbrev-table-name-list)))))) (while (and he-expand-list @@ -939,7 +939,7 @@ string). It returns t if a new expansion is found, nil otherwise." (widen)) ;; Try looking backward unless inhibited. (if he-search-bw - (progn + (progn (goto-char he-search-loc) (setq expansion (he-dabbrev-search he-search-string t)) (set-marker he-search-loc (point)) @@ -949,11 +949,11 @@ string). It returns t if a new expansion is found, nil otherwise." (setq he-search-bw ()))))) (if (not expansion) ; Then look forward. - (progn + (progn (goto-char he-search-loc) (setq expansion (he-dabbrev-search he-search-string nil)) (set-marker he-search-loc (point))))))) - + (if (not expansion) (progn (if old (he-reset-string)) @@ -978,7 +978,7 @@ string). It returns t if a new expansion is found, nil otherwise." (set-marker he-search-loc 1 (car he-search-bufs)))) (if (not (equal he-search-string "")) - (while (and he-search-bufs + (while (and he-search-bufs (not expansion) (or (not hippie-expand-max-buffers) (< he-searched-n-bufs hippie-expand-max-buffers))) @@ -1047,13 +1047,13 @@ string). It returns t if a new expansion is found, nil otherwise." (window-end he-search-window)))) (set-marker he-search-loc (point) (current-buffer))) (if (not expansion) - (progn + (progn (setq he-search-window (next-window he-search-window nil flag)) (if (eq he-search-window (selected-window)) (set-marker he-search-loc nil) (set-marker he-search-loc (window-start he-search-window) (window-buffer he-search-window)))))) - + (set-buffer buf) (if (not expansion) (progn @@ -1072,7 +1072,7 @@ string). It returns t if a new expansion is found, nil otherwise." (t (concat "\\<" (regexp-quote pattern) "\\(\\sw\\|\\s_\\)+"))))) - (while (and (not result) + (while (and (not result) (if reverse (re-search-backward regpat limit t) (re-search-forward regpat limit t))) @@ -1104,7 +1104,7 @@ for subsequent calls (for further possible completions of the same string). It returns t if a new completion is found, nil otherwise." (let ((expansion ())) (if (not old) - (progn + (progn (he-init-string (he-dabbrev-beg) (point)) (setq he-expand-list (if (not (equal he-search-string "")) @@ -1130,7 +1130,7 @@ string). It returns t if a new completion is found, nil otherwise." (concat "\\<" (regexp-quote pattern) "\\(\\sw\\|\\s_\\)+")))) (killstr (car he-expand-list))) - (while (and (not result) + (while (and (not result) he-expand-list) (while (and (not result) (string-match regpat killstr he-search-loc2)) @@ -1143,10 +1143,10 @@ string). It returns t if a new completion is found, nil otherwise." '(?_ ?w))) (he-string-member result he-tried-table t)) (setq result nil))) ; ignore if bad prefix or already in table - (if (and (not result) + (if (and (not result) he-expand-list) (progn - (setq he-expand-list (cdr he-expand-list)) + (setq he-expand-list (cdr he-expand-list)) (setq killstr (car he-expand-list)) (setq he-search-loc2 0)))) result)) @@ -1158,11 +1158,11 @@ for subsequent calls (for further possible completions of the same string). It returns t if a new completion is found, nil otherwise." (let ((expansion ())) (if (not old) - (progn + (progn (he-init-string (he-kill-beg) (point)) (if (not (he-string-member he-search-string he-tried-table)) (setq he-tried-table (cons he-search-string he-tried-table))) - (setq he-expand-list + (setq he-expand-list (if (not (equal he-search-string "")) kill-ring)) (setq he-search-loc2 ()))) @@ -1206,7 +1206,7 @@ string). It returns t if a new completion is found, nil otherwise." (if (and (not result) he-expand-list) (progn - (setq he-expand-list (cdr he-expand-list)) + (setq he-expand-list (cdr he-expand-list)) (setq killstr (car he-expand-list)) (setq pos -1)))) result)) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index c2c53f5b042..0573b0046a6 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1631,7 +1631,7 @@ This is used for loading and byte-compiling Emacs Lisp files.") (defun auto-coding-alist-lookup (filename) "Return the coding system specified by `auto-coding-alist' for FILENAME." (let ((alist auto-coding-alist) - (case-fold-search (memq system-type '(vax-vms windows-nt ms-dos))) + (case-fold-search (memq system-type '(vax-vms windows-nt ms-dos cygwin))) coding-system) (while (and alist (not coding-system)) (if (string-match (car (car alist)) filename) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 0a417a22f0f..0ebc41150df 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -227,7 +227,7 @@ ;;;###autoload (defcustom browse-url-browser-function - (if (memq system-type '(windows-nt ms-dos)) + (if (memq system-type '(windows-nt ms-dos cygwin)) 'browse-url-default-windows-browser 'browse-url-default-browser) "*Function to display the current buffer in a WWW browser. @@ -381,7 +381,7 @@ commands reverses the effect of this variable. Requires Netscape version ;; it in anonymous cases. If it's not anonymous the next regexp ;; applies. ("^/\\([^:@]+@\\)?\\([^:]+\\):/*" . "ftp://\\1\\2/") - (,@ (if (memq system-type '(windows-nt ms-dos)) + (,@ (if (memq system-type '(windows-nt ms-dos cygwin)) '(("^\\([a-zA-Z]:\\)[\\/]" . "file:\\1/") ("^[\\/][\\/]+" . "file://")))) ("^/+" . "file:/"))) @@ -972,7 +972,7 @@ effect of `browse-url-new-window-flag'. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'." - (interactive (browse-url-interactive-arg "URL: ")) + (interactive (browse-url-interactive-arg "URL: ")) (apply 'start-process (concat "gnome-moz-remote " url) nil "gnome-moz-remote" diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 7a3f7aaae3a..cc4b876477a 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -139,7 +139,7 @@ :type '(choice regexp (const :tag "None" nil)) :group 'pcomplete) -(defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt)) +(defcustom pcomplete-ignore-case (memq system-type '(ms-dos windows-nt cygwin)) "*If non-nil, ignore case when doing filename completion." :type 'boolean :group 'pcomplete) diff --git a/lisp/recentf.el b/lisp/recentf.el index 72e026ab2db..f7683e30698 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -156,7 +156,7 @@ The filter function is called with one argument, the list of menu elements used to build the menu and must return a new list of menu elements (see `recentf-make-menu-element' for menu element form)." :group 'recentf - :type '(radio (const nil) + :type '(radio (const nil) (function-item recentf-sort-ascending) (function-item recentf-sort-descending) (function-item recentf-sort-basenames-ascending) @@ -201,7 +201,7 @@ used to build the menu and must return a new list of menu elements (see ;;;; Common functions ;;;; (defconst recentf-case-fold-search - (memq system-type '(vax-vms windows-nt)) + (memq system-type '(vax-vms windows-nt cygwin)) "Non-nil if recentf searches and matches should ignore case.") (defun recentf-include-p (filename) @@ -676,7 +676,7 @@ Arrange them in sub-menus following rules in `recentf-arrange-rules'." ;; It is important to preserve auto-mode-alist order ;; to ensure the right file <-> mode association (nreverse rules))) - + (defun recentf-arrange-by-mode (l) "Filter the list of menu-elements L to build sub-menus for each major mode." (let ((recentf-arrange-rules (recentf-build-mode-rules)) @@ -765,7 +765,7 @@ Each filter is defined by a pair (FILTER-FUN . FILTER-LBL) where: (setq filters (cdr filters))))) (if (consp filters) (car filters)))) - + (defun recentf-filter-changer (l) "Manage a ring of filters. `recentf-filter-changer-alist' defines the filters in the ring. @@ -888,7 +888,7 @@ Holds list of files to be deleted from `recentf-list'.") (setq recentf-edit-selected-items (nconc (list value) recentf-edit-selected-items)) (message "%s added to selection." value))))) - + ;;;###autoload (defun recentf-edit-list () "Allow the user to edit the files that are kept in the recent list." diff --git a/lisp/shell.el b/lisp/shell.el index fa4f31ce5f0..77ad7f2808c 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -165,7 +165,7 @@ shell buffer. The value may depend on the operating system or shell. This is a fine thing to set in your `.emacs' file.") (defvar shell-file-name-chars - (if (memq system-type '(ms-dos windows-nt)) + (if (memq system-type '(ms-dos windows-nt cygwin)) "~/A-Za-z0-9_^$!#%&{}@`'.,:()-" "~/A-Za-z0-9+@:_.$#%,={}-") "String of characters valid in a file name. diff --git a/lisp/woman.el b/lisp/woman.el index 115e70546bb..c3becb5186e 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1347,7 +1347,7 @@ Any UN*X-style environment variables are evaluated first." ;; including `.' and `..', so remove any trailing / !!! (if (string= (substring dir -1) "/") (setq dir (substring dir 0 -1))) - (if (memq system-type '(windows-nt ms-dos)) ; what else? + (if (memq system-type '(windows-nt ms-dos cygwin)) ; what else? ;; Match capitalization used by `file-name-directory': (setq dir (concat (file-name-directory dir) (file-name-nondirectory dir)))) |