X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/114f9c96795aff3b51b9060d7c9c1b77debcc99a..dd92b5f5047931f6020045ce47360b62d1c2cb72:/lisp/eshell/em-glob.el diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index d4ad3009f8..b06804e069 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -1,7 +1,6 @@ -;;; em-glob.el --- extended file name globbing +;;; em-glob.el --- extended file name globbing -*- lexical-binding:t -*- -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999-2016 Free Software Foundation, Inc. ;; Author: John Wiegley @@ -50,52 +49,54 @@ ;;; Code: -(eval-when-compile (require 'eshell)) (require 'esh-util) +(eval-when-compile (require 'eshell)) ;;;###autoload -(eshell-defgroup eshell-glob nil +(progn +(defgroup eshell-glob nil "This module provides extended globbing syntax, similar what is used by zsh for filename generation." :tag "Extended filename globbing" - :group 'eshell-module) + :group 'eshell-module)) ;;; User Variables: -(defcustom eshell-glob-load-hook '(eshell-glob-initialize) - "*A list of functions to run when `eshell-glob' is loaded." +(defcustom eshell-glob-load-hook nil + "A list of functions to run when `eshell-glob' is loaded." + :version "24.1" ; removed eshell-glob-initialize :type 'hook :group 'eshell-glob) (defcustom eshell-glob-include-dot-files nil - "*If non-nil, glob patterns will match files beginning with a dot." + "If non-nil, glob patterns will match files beginning with a dot." :type 'boolean :group 'eshell-glob) (defcustom eshell-glob-include-dot-dot t - "*If non-nil, glob patterns that match dots will match . and .." + "If non-nil, glob patterns that match dots will match . and .." :type 'boolean :group 'eshell-glob) (defcustom eshell-glob-case-insensitive (eshell-under-windows-p) - "*If non-nil, glob pattern matching will ignore case." + "If non-nil, glob pattern matching will ignore case." :type 'boolean :group 'eshell-glob) (defcustom eshell-glob-show-progress nil - "*If non-nil, display progress messages during a recursive glob. + "If non-nil, display progress messages during a recursive glob. This option slows down recursive glob processing by quite a bit." :type 'boolean :group 'eshell-glob) (defcustom eshell-error-if-no-glob nil - "*If non-nil, it is an error for a glob pattern not to match. - This mimcs the behavior of zsh if non-nil, but bash if nil." + "If non-nil, it is an error for a glob pattern not to match. + This mimics the behavior of zsh if non-nil, but bash if nil." :type 'boolean :group 'eshell-glob) (defcustom eshell-glob-chars-list '(?\] ?\[ ?* ?? ?~ ?\( ?\) ?| ?# ?^) - "*List of additional characters used in extended globbing." + "List of additional characters used in extended globbing." :type '(repeat character) :group 'eshell-glob) @@ -117,8 +118,9 @@ This option slows down recursive glob processing by quite a bit." (if (eq (aref str (1+ pos)) ?*) "*" "+")) (+ pos 2)) (cons "*" (1+ pos)))))) - "*An alist for translation of extended globbing characters." - :type '(repeat (cons character (choice regexp function))) + "An alist for translation of extended globbing characters." + :type '(alist :key-type character + :value-type (choice string function)) :group 'eshell-glob) ;;; Functions: @@ -148,10 +150,10 @@ This option slows down recursive glob processing by quite a bit." ;; if this is a glob pattern than needs to be expanded, then it ;; will need to expand each member of the resulting glob list (add-to-list 'eshell-current-modifiers - '(lambda (list) - (if (listp list) - (mapcar 'expand-file-name list) - (expand-file-name list))))) + (lambda (list) + (if (listp list) + (mapcar 'expand-file-name list) + (expand-file-name list))))) (add-to-list 'eshell-current-modifiers 'eshell-extended-glob)) (defun eshell-parse-glob-chars () @@ -178,6 +180,8 @@ interpretation." (goto-char (1+ end)))))))))) (defvar eshell-glob-chars-regexp nil) +(defvar eshell-glob-matches) +(defvar message-shown) (defun eshell-glob-regexp (pattern) "Convert glob-pattern PATTERN to a regular expression. @@ -189,8 +193,8 @@ The basic syntax is: * .* matches any group of characters (or none) # * matches zero or more occurrences of preceding ## + matches one or more occurrences of preceding - (x) \(x\) makes 'x' a regular expression group - | \| boolean OR within an expression group + (x) \\(x\\) makes `x' a regular expression group + | \\| boolean OR within an expression group [a-b] [a-b] matches a character or range [^a] [^a] excludes a character or range @@ -216,7 +220,7 @@ resulting regular expression." matched-in-pattern (1+ op-begin)) (let ((xlat (assq op-char eshell-glob-translate-alist))) (if (not xlat) - (error "Unrecognized globbing character '%c'" op-char) + (error "Unrecognized globbing character `%c'" op-char) (if (stringp (cdr xlat)) (setq regexp (concat regexp (cdr xlat)) matched-in-pattern (1+ op-begin)) @@ -228,6 +232,8 @@ resulting regular expression." (regexp-quote (substring pattern matched-in-pattern)) "\\'"))) +(defvar ange-cache) ; XEmacs? See esh-util + (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 @@ -246,7 +252,7 @@ the form: (INCLUDE-REGEXP EXCLUDE-REGEXP (PRED-FUNC-LIST) (MOD-FUNC-LIST))" (let ((paths (eshell-split-path glob)) - matches message-shown ange-cache) + eshell-glob-matches message-shown ange-cache) (unwind-protect (if (and (cdr paths) (file-name-absolute-p (car paths))) @@ -255,15 +261,12 @@ the form: (eshell-glob-entries (file-name-as-directory ".") paths)) (if message-shown (message nil))) - (or (and matches (sort matches #'string<)) + (or (and eshell-glob-matches (sort eshell-glob-matches #'string<)) (if eshell-error-if-no-glob (error "No matches found: %s" glob) glob)))) -(defvar matches) -(defvar message-shown) - -;; FIXME does this really need to abuse matches, message-shown? +;; FIXME does this really need to abuse eshell-glob-matches, message-shown? (defun eshell-glob-entries (path globs &optional recurse-p) "Glob the entries in PATHS, possibly recursing if RECURSE-P is non-nil." (let* ((entries (ignore-errors @@ -286,7 +289,7 @@ the form: glob (car globs) len (length glob))))) (if (and recurse-p (not glob)) - (error "'**' cannot end a globbing pattern")) + (error "`**' cannot end a globbing pattern")) (let ((index 1)) (setq incl glob) (while (and (eq incl glob) @@ -319,7 +322,7 @@ the form: "\\`\\."))) (when (and recurse-p eshell-glob-show-progress) (message "Building file list...%d so far: %s" - (length matches) path) + (length eshell-glob-matches) path) (setq message-shown t)) (if (equal path "./") (setq path "")) (while entries @@ -332,7 +335,8 @@ the form: (if (cdr globs) (if isdir (setq dirs (cons (concat path name) dirs))) - (setq matches (cons (concat path name) matches)))) + (setq eshell-glob-matches + (cons (concat path name) eshell-glob-matches)))) (if (and recurse-p isdir (or (> len 3) (not (or (and (= len 2) (equal name "./")) @@ -358,5 +362,4 @@ the form: ;; generated-autoload-file: "esh-groups.el" ;; End: -;; arch-tag: d0548f54-fb7c-4978-a88e-f7c26f7f68ca ;;; em-glob.el ends here