branch: externals/urgrep commit 9ff22a448115dcfe3f16f33c00a42682e8808ac7 Author: Jim Porter <jporterb...@gmail.com> Commit: Jim Porter <jporterb...@gmail.com>
Minor fixes to defcustoms --- urgrep.el | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/urgrep.el b/urgrep.el index 56008bed3c..665bd93164 100644 --- a/urgrep.el +++ b/urgrep.el @@ -62,8 +62,8 @@ Valid values are nil (case-sensitive), t (case-insensitive), `smart' \(case-insensitive if the query is all lower case), and `inherit' \(case-sensitive if `case-fold-search' is nil, \"smart\" otherwise)." :type '(radio (const :tag "Case sensitive" nil) - (const :tag "Smart case" 'smart) - (const :tag "Inherit from `case-fold-search'" 'inherit) + (const :tag "Smart case" smart) + (const :tag "Inherit from `case-fold-search'" inherit) (const :tag "Case insensitive" t)) :group 'urgrep) @@ -75,11 +75,6 @@ respectively." :type '(choice integer (cons integer integer)) :group 'urgrep) -(defcustom urgrep-file-wildcards nil - "Zero or more wildcards to limit the files searched." - :type '(choice string (repeat string)) - :group 'urgrep) - (defface urgrep-hit '((t :inherit compilation-info)) "Face for matching files." :group 'urgrep) @@ -414,19 +409,20 @@ FILES: a wildcard (or list of wildcards) to limit the files searched." ;; urgrep-mode +(defvar urgrep-file-wildcards nil + "Zero or more wildcards to limit the files searched.") (defvar urgrep-num-matches-found 0 "Running total of matches found. This will be set buffer-locally.") +(defvar-local urgrep-current-query nil + "The most recent search query run in this buffer.") +(defvar-local urgrep-current-tool nil + "The most recent search tool used in this buffer.") ;; Set the first column to 0 because that's how we currently count. ;; XXX: It might be worth changing this to 1 if we allow reading the column ;; number explicitly in the output. (defvar urgrep-first-column 0) -(defvar-local urgrep-current-query nil - "The most recent search query run in this buffer.") -(defvar-local urgrep-current-tool nil - "The most recent search tool used in this buffer.") - (defun urgrep-search-again (&optional edit-command) "Re-run the previous search. If EDIT-COMMAND is non-nil, the search can be edited."