emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 07624b3 180/272: Fix compilation warnings


From: Oleh Krehel
Subject: [elpa] master 07624b3 180/272: Fix compilation warnings
Date: Mon, 25 Apr 2016 10:13:24 +0000

branch: master
commit 07624b3c7dc8b2962976d625ba56d26c0d2f425a
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Fix compilation warnings
---
 counsel.el |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/counsel.el b/counsel.el
index 96e82f8..64baa76 100644
--- a/counsel.el
+++ b/counsel.el
@@ -170,24 +170,13 @@ Update the minibuffer with the amount of lines collected 
every
   '(choice
     (const :tag "Plain" counsel-prompt-function-default)
     (const :tag "Directory" counsel-prompt-function-dir)
-    (function :tag "Custom")))
+    (function :tag "Custom"))
+  :group 'ivy)
 
 (defun counsel-prompt-function-default (prompt)
   "Return PROMPT appended with a semicolon."
   (format "%s: " prompt))
 
-(defun counsel-prompt-function-dir (prompt)
-  "Return PROMPT appended with the parent directory."
-  (let ((directory counsel--git-grep-dir))
-    (format "%s [%s]: "
-            prompt
-            (let ((dir-list (eshell-split-path directory)))
-              (if (> (length dir-list) 3)
-                  (apply #'concat
-                         (append '("...")
-                                 (cl-subseq dir-list (- (length dir-list) 3))))
-                directory)))))
-
 (defun counsel-delete-process ()
   (let ((process (get-process " *counsel*")))
     (when process
@@ -752,6 +741,18 @@ Describe the selected candidate."
   '("git --no-pager grep --full-name -n --no-color -i -e %S")
   "History for `counsel-git-grep' shell commands.")
 
+(defun counsel-prompt-function-dir (prompt)
+  "Return PROMPT appended with the parent directory."
+  (let ((directory counsel--git-grep-dir))
+    (format "%s [%s]: "
+            prompt
+            (let ((dir-list (eshell-split-path directory)))
+              (if (> (length dir-list) 3)
+                  (apply #'concat
+                         (append '("...")
+                                 (cl-subseq dir-list (- (length dir-list) 3))))
+                directory)))))
+
 (defun counsel-git-grep-function (string &optional _pred &rest _unused)
   "Grep in the current git repository for STRING."
   (if (and (> counsel--git-grep-count 20000)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]