[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 3b5cce3 043/332: fix compiler errors and warn
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 3b5cce3 043/332: fix compiler errors and warnings |
Date: |
Tue, 1 Dec 2020 15:48:07 -0500 (EST) |
branch: externals/el-search
commit 3b5cce3edc4e50207a70d52158a289e495363fc5
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
fix compiler errors and warnings
---
el-search.el | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/el-search.el b/el-search.el
index 0a12113..b286e07 100644
--- a/el-search.el
+++ b/el-search.el
@@ -231,6 +231,7 @@
(require 'cl-lib)
(require 'elisp-mode)
(require 'thingatpt)
+(require 'help-fns) ;el-search--make-docstring
;;;; Configuration stuff
@@ -284,6 +285,8 @@ prompt to refer to the value of the currently tested
expression."
(read-from-minibuffer prompt initial-contents
el-search-read-expression-map read
(or hist 'read-expression-history) default)))
+(defvar el-search--initial-mb-contents nil)
+
(defun el-search--read-pattern (prompt &optional default read)
(let ((this-sexp (sexp-at-point)))
(minibuffer-with-setup-hook
@@ -341,7 +344,6 @@ Point must not be inside a string or comment."
;; code mainly from `pcase--make-docstring'
(let* ((main (documentation (symbol-function 'el-search-pattern) 'raw))
(ud (help-split-fundoc main 'pcase)))
- (require 'help-fns)
(with-temp-buffer
(insert (or (cdr ud) main))
(mapc
@@ -437,13 +439,14 @@ this pattern type."
,@body))
(defun el-search--matcher (pattern &rest body)
- (let ((warning-suppress-log-types '((bytecomp))))
- (el-search--with-additional-pcase-macros
- (byte-compile
- `(lambda (expression)
- (pcase expression
- (,pattern ,@(or body (list t)))
- (_ nil)))))))
+ (eval
+ `(el-search--with-additional-pcase-macros
+ (let ((warning-suppress-log-types '((bytecomp))))
+ (byte-compile
+ (lambda (expression)
+ (pcase expression
+ (,pattern ,@(or body (list t)))
+ (_ nil))))))))
(defun el-search--match-p (matcher expression)
(funcall matcher expression))
@@ -686,10 +689,6 @@ The following additional pattern types are currently
defined:\n"
(if (zerop nbr-skipped) ""
(format " (%d skipped)" nbr-skipped)))))
-;; We need a variable for the initial contents because we want to
`call-interactively'
-;; `el-search-query-replace-read-args'
-(defvar el-search--initial-mb-contents nil)
-
(defun el-search-query-replace-read-args ()
(barf-if-buffer-read-only)
(let* ((from (el-search--read-pattern "Replace from: "))
- [elpa] externals/el-search f54c5f1 037/332: spelling fixes, (continued)
- [elpa] externals/el-search f54c5f1 037/332: spelling fixes, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 192316b 006/332: el-search: fix two typos, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 92538ed 007/332: el-search: remove redundant package dependency on cl-lib, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 9ab546b 017/332: drop el-search-expression-contains-match-p, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1694128 029/332: some doc tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 7886e33 031/332: fix el-search--repair-replacement-layout: don't move when replacing, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 672def6 034/332: fix whitespace, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search daa7f92 039/332: improve docs; new: el-search-defpattern; add some pattern types, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e14236a 038/332: fix whitespace, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 00d6af1 040/332: remove search wrapping functionality, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3b5cce3 043/332: fix compiler errors and warnings,
Stefan Monnier <=
- [elpa] externals/el-search 06af085 044/332: edit TODO list, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ec0c3e8 053/332: el-search: new pattern type `not', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0809f99 072/332: New user option: el-search-use-sloppy-strings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ba82854 022/332: rename a local variable, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1222012 046/332: prerequisites to allow replace with multiple expressions, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0af261a 050/332: el-search: some cleanup, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3370594 060/332: el-search: New pattern type `l', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b936a28 062/332: Go to isearch left end when starting replace, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 59c6139 064/332: Complete and document what a SYMBOL in `l' matches, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2c1cdeb 066/332: factor out minibuffer setup hook fun; treat empty input, Stefan Monnier, 2020/12/01