[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master bc335af 56/57: Fixup compilation warnings
From: |
Oleh Krehel |
Subject: |
[elpa] master bc335af 56/57: Fixup compilation warnings |
Date: |
Tue, 19 May 2015 14:21:42 +0000 |
branch: master
commit bc335af4d94d80d3605b66ed51a15d2476ad2179
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fixup compilation warnings
---
ivy.el | 25 ++++++++++++++-----------
swiper.el | 6 +++---
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/ivy.el b/ivy.el
index 9870032..13955b9 100644
--- a/ivy.el
+++ b/ivy.el
@@ -198,6 +198,15 @@ When non-nil, it should contain one %d.")
(defvar ivy--regex-function 'ivy--regex
"Current function for building a regex.")
+(defvar ivy--subexps 0
+ "Number of groups in the current `ivy--regex'.")
+
+(defvar ivy--full-length nil
+ "When :dynamic-collection is non-nil, this can be the total amount of
candidates.")
+
+(defvar ivy--old-text ""
+ "Store old `ivy-text' for dynamic completion.")
+
(defvar Info-current-file)
(defmacro ivy-quit-and-run (&rest body)
@@ -807,9 +816,6 @@ Minibuffer bindings:
;;* Implementation
;;** Regex
-(defvar ivy--subexps 0
- "Number of groups in the current `ivy--regex'.")
-
(defvar ivy--regex-hash
(make-hash-table :test 'equal)
"Store pre-computed regex.")
@@ -821,7 +827,8 @@ This allows to \"quote\" N spaces by inputting N+1 spaces."
(let ((len (length str))
start0
(start1 0)
- res s)
+ res s
+ match-len)
(while (and (string-match " +" str start1)
(< start1 len))
(setq match-len (- (match-end 0) (match-beginning 0)))
@@ -934,17 +941,11 @@ Everything after \"!\" should not match."
(goto-char (minibuffer-prompt-end))
(delete-region (line-end-position) (point-max))))
-(defvar ivy--full-length nil
- "When :dynamic-collection is non-nil, this can be the total amount of
candidates.")
-
-(defvar ivy--old-text ""
- "Store old `ivy-text' for dynamic completion.")
-
(defun ivy--insert-prompt ()
"Update the prompt according to `ivy--prompt'."
(when ivy--prompt
(unless (memq this-command '(ivy-done ivy-alt-done ivy-partial-or-done
- counsel-find-symbol))
+ counsel-find-symbol))
(setq ivy--prompt-extra ""))
(let (head tail)
(if (string-match "\\(.*\\): $" ivy--prompt)
@@ -1046,6 +1047,8 @@ Should be run via minibuffer `post-command-hook'."
(forward-line 1)
(insert text)))))
+(declare-function colir-blend-face-background "ext:colir")
+
(defun ivy--add-face (str face)
"Propertize STR with FACE.
`font-lock-append-text-property' is used, since it's better than
diff --git a/swiper.el b/swiper.el
index c52266c..7955817 100644
--- a/swiper.el
+++ b/swiper.el
@@ -83,6 +83,9 @@
map)
"Keymap for swiper.")
+(defvar swiper--window nil
+ "Store the current window.")
+
(defun swiper-query-replace ()
"Start `query-replace' with string to replace from last search string."
(interactive)
@@ -119,9 +122,6 @@
(ivy-quit-and-run
(avy--goto candidate)))))
-(defvar swiper--window nil
- "Store the current window.")
-
(defun swiper-recenter-top-bottom (&optional arg)
"Call (`recenter-top-bottom' ARG) in `swiper--window'."
(interactive "P")
- [elpa] master e0b6c0c 46/57: Update the way spaces are quoted using ivy, (continued)
- [elpa] master e0b6c0c 46/57: Update the way spaces are quoted using ivy, Oleh Krehel, 2015/05/19
- [elpa] master 323efda 38/57: counsel-git-grep now works with ivy-resume, Oleh Krehel, 2015/05/19
- [elpa] master 88f4508 49/57: ivy.el (ivy-kill-word): Add and bind to "M-d", Oleh Krehel, 2015/05/19
- [elpa] master de5833e 51/57: Don't error on incomplete bad regexp in counsel-git-grep, Oleh Krehel, 2015/05/19
- [elpa] master 89b9e9a 48/57: README.md: Add sample init, Oleh Krehel, 2015/05/19
- [elpa] master 28cb795 53/57: Don't try to call permanent action if there's none, Oleh Krehel, 2015/05/19
- [elpa] master 75a059c 44/57: Allow to recenter with "C-l" during counsel-git-grep, Oleh Krehel, 2015/05/19
- [elpa] master 4f75381 55/57: When building a regex, consider ^ only at start, Oleh Krehel, 2015/05/19
- [elpa] master 5afceff 52/57: ivy.el (ivy-forward-char): Add and bind to "C-f", Oleh Krehel, 2015/05/19
- [elpa] master 155f2a6 57/57: Merge commit 'bc335af4d94d80d3605b66ed51a15d2476ad2179' from swiper, Oleh Krehel, 2015/05/19
- [elpa] master bc335af 56/57: Fixup compilation warnings,
Oleh Krehel <=