[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/eshell/em-glob.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/eshell/em-glob.el |
Date: |
Fri, 04 Apr 2003 01:22:05 -0500 |
Index: emacs/lisp/eshell/em-glob.el
diff -c emacs/lisp/eshell/em-glob.el:1.9 emacs/lisp/eshell/em-glob.el:1.10
*** emacs/lisp/eshell/em-glob.el:1.9 Fri Aug 9 20:18:18 2002
--- emacs/lisp/eshell/em-glob.el Thu Nov 7 18:00:32 2002
***************
*** 21,29 ****
--- 21,32 ----
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
+ ;;; Code:
+
(provide 'em-glob)
(eval-when-compile (require 'esh-maint))
+ (require 'esh-util)
(defgroup eshell-glob nil
"This module provides extended globbing syntax, similar what is used
***************
*** 128,135 ****
(defun eshell-glob-initialize ()
"Initialize the extended globbing code."
;; it's important that `eshell-glob-chars-list' come first
! (set (make-local-variable 'eshell-special-chars-outside-quoting)
! (append eshell-glob-chars-list eshell-special-chars-outside-quoting))
(set (make-local-variable 'eshell-glob-chars-regexp)
(format "[%s]+" (apply 'string eshell-glob-chars-list)))
(add-hook 'eshell-parse-argument-hook 'eshell-parse-glob-chars t t)
--- 131,139 ----
(defun eshell-glob-initialize ()
"Initialize the extended globbing code."
;; it's important that `eshell-glob-chars-list' come first
! (when (boundp 'eshell-special-chars-outside-quoting)
! (set (make-local-variable 'eshell-special-chars-outside-quoting)
! (append eshell-glob-chars-list eshell-special-chars-outside-quoting)))
(set (make-local-variable 'eshell-glob-chars-regexp)
(format "[%s]+" (apply 'string eshell-glob-chars-list)))
(add-hook 'eshell-parse-argument-hook 'eshell-parse-glob-chars t t)
***************
*** 228,246 ****
(defun eshell-extended-glob (glob)
"Return a list of files generated from GLOB, perhaps looking for DIRS-ONLY.
! This function almost fully supports zsh style filename generation
! syntax. Things that are not supported are:
^foo for matching everything but foo
(foo~bar) tilde within a parenthesis group
foo<1-10> numeric ranges
foo~x(a|b) (a|b) will be interpreted as a predicate/modifier list
! Mainly they are not supported because file matching is done with Emacs
! regular expressions, and these cannot support the above constructs.
! If this routine fails, it returns nil. Otherwise, it returns a list
! the form:
(INCLUDE-REGEXP EXCLUDE-REGEXP (PRED-FUNC-LIST) (MOD-FUNC-LIST))"
(let ((paths (eshell-split-path glob))
--- 232,250 ----
(defun eshell-extended-glob (glob)
"Return a list of files generated from GLOB, perhaps looking for DIRS-ONLY.
! This function almost fully supports zsh style filename generation
! syntax. Things that are not supported are:
^foo for matching everything but foo
(foo~bar) tilde within a parenthesis group
foo<1-10> numeric ranges
foo~x(a|b) (a|b) will be interpreted as a predicate/modifier list
! Mainly they are not supported because file matching is done with Emacs
! regular expressions, and these cannot support the above constructs.
! If this routine fails, it returns nil. Otherwise, it returns a list
! the form:
(INCLUDE-REGEXP EXCLUDE-REGEXP (PRED-FUNC-LIST) (MOD-FUNC-LIST))"
(let ((paths (eshell-split-path glob))
***************
*** 352,358 ****
(while rdirs
(eshell-glob-entries (car rdirs) globs recurse-p)
(setq rdirs (cdr rdirs)))))
-
- ;;; Code:
;;; em-glob.el ends here
--- 356,360 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/eshell/em-glob.el,
Miles Bader <=