Mercurial > emacs
comparison lisp/eshell/em-cmpl.el @ 90188:01137c1fdbe9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 324-352)
- Merge from gnus--rel--5.10
- Update from CVS
- etc/emacs-buffer.gdb: Remove RCS keywords
* gnus--rel--5.10 (patch 70-79)
- Update from CVS
- Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 06 Jun 2005 02:39:45 +0000 |
parents | 68c22ea6027c b89e30bcd2bb |
children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
90187:587ea1490d70 | 90188:01137c1fdbe9 |
---|---|
134 (documentation-property 'pcomplete-file-ignore | 134 (documentation-property 'pcomplete-file-ignore |
135 'variable-documentation) | 135 'variable-documentation) |
136 :type (get 'pcomplete-file-ignore 'custom-type) | 136 :type (get 'pcomplete-file-ignore 'custom-type) |
137 :group 'eshell-cmpl) | 137 :group 'eshell-cmpl) |
138 | 138 |
139 (defcustom eshell-cmpl-dir-ignore | 139 (defcustom eshell-cmpl-dir-ignore "\\`\\(\\.\\.?\\|CVS\\)/\\'" |
140 (format "\\`\\(\\.\\.?\\|CVS\\)%c\\'" directory-sep-char) | |
141 (documentation-property 'pcomplete-dir-ignore | 140 (documentation-property 'pcomplete-dir-ignore |
142 'variable-documentation) | 141 'variable-documentation) |
143 :type (get 'pcomplete-dir-ignore 'custom-type) | 142 :type (get 'pcomplete-dir-ignore 'custom-type) |
144 :group 'eshell-cmpl) | 143 :group 'eshell-cmpl) |
145 | 144 |
153 (documentation-property 'pcomplete-autolist | 152 (documentation-property 'pcomplete-autolist |
154 'variable-documentation) | 153 'variable-documentation) |
155 :type (get 'pcomplete-autolist 'custom-type) | 154 :type (get 'pcomplete-autolist 'custom-type) |
156 :group 'eshell-cmpl) | 155 :group 'eshell-cmpl) |
157 | 156 |
158 (defcustom eshell-cmpl-suffix-list (list directory-sep-char ?:) | 157 (defcustom eshell-cmpl-suffix-list (list ?/ ?:) |
159 (documentation-property 'pcomplete-suffix-list | 158 (documentation-property 'pcomplete-suffix-list |
160 'variable-documentation) | 159 'variable-documentation) |
161 :type (get 'pcomplete-suffix-list 'custom-type) | 160 :type (get 'pcomplete-suffix-list 'custom-type) |
162 :group 'pcomplete) | 161 :group 'pcomplete) |
163 | 162 |
368 (setq a (cdr a) i (1+ i))) | 367 (setq a (cdr a) i (1+ i))) |
369 (and l | 368 (and l |
370 (setq args (nthcdr (1+ l) args) | 369 (setq args (nthcdr (1+ l) args) |
371 posns (nthcdr (1+ l) posns)))) | 370 posns (nthcdr (1+ l) posns)))) |
372 (assert (= (length args) (length posns))) | 371 (assert (= (length args) (length posns))) |
373 (when (and args (eq (char-syntax (char-before end)) ? )) | 372 (when (and args (eq (char-syntax (char-before end)) ? ) |
373 (not (eq (char-before (1- end)) ?\\))) | |
374 (nconc args (list "")) | 374 (nconc args (list "")) |
375 (nconc posns (list (point)))) | 375 (nconc posns (list (point)))) |
376 (cons (mapcar | 376 (cons (mapcar |
377 (function | 377 (function |
378 (lambda (arg) | 378 (lambda (arg) |