[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 675bd5f 11/12: Fix describe-function / -variable "C-." int
|
From: |
Oleh Krehel |
|
Subject: |
[elpa] master 675bd5f 11/12: Fix describe-function / -variable "C-." interaction |
|
Date: |
Tue, 21 Apr 2015 12:09:23 +0000 |
branch: master
commit 675bd5ff97f75fb7d838e6056442ce71adf85e56
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix describe-function / -variable "C-." interaction
* counsel.el (counsel-describe-variable): Don't describe variable if
jump-to-symbol action was chosen.
(counsel-describe-function): Don't describe variable if
jump-to-symbol action was chosen.
I should handle this more gracefully if multiple actions become a
pattern.
---
counsel.el | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/counsel.el b/counsel.el
index 62159b9..7ad7787 100644
--- a/counsel.el
+++ b/counsel.el
@@ -73,6 +73,7 @@
(enable-recursive-minibuffers t)
(preselect (thing-at-point 'symbol))
val)
+ (setq ivy--action nil)
(setq val (ivy-read
(if (symbolp v)
(format
@@ -90,7 +91,8 @@
(list (if (equal val "")
v
(intern val)))))
- (describe-variable variable buffer frame))
+ (unless (eq ivy--action 'counsel--find-symbol)
+ (describe-variable variable buffer frame)))
(defun counsel-describe-function (function)
"Forward to (`describe-function' FUNCTION) with ivy completion."
@@ -99,6 +101,7 @@
(enable-recursive-minibuffers t)
(preselect (thing-at-point 'symbol))
val)
+ (setq ivy--action nil)
(setq val (ivy-read (if fn
(format "Describe function (default %s): " fn)
"Describe function: ")
@@ -112,7 +115,8 @@
nil t))
(list (if (equal val "")
fn (intern val)))))
- (describe-function function))
+ (unless (eq ivy--action 'counsel--find-symbol)
+ (describe-function function)))
(defvar info-lookup-mode)
(declare-function info-lookup->completions "info-look")
- [elpa] master 0d1fa17 01/12: ivy.el (ivy-done): Expand file name for empty text, (continued)
- [elpa] master 0d1fa17 01/12: ivy.el (ivy-done): Expand file name for empty text, Oleh Krehel, 2015/04/21
- [elpa] master 36b15f3 02/12: ivy.el (ivy--regex): Switch to non-greedy ".*?" joiner, Oleh Krehel, 2015/04/21
- [elpa] master 49638b4 04/12: ivy.el (ivy--sorted-files): Avoid returning an empty list, Oleh Krehel, 2015/04/21
- [elpa] master 2a5d3fc 05/12: Fix double-sorting for file names, Oleh Krehel, 2015/04/21
- [elpa] master bb89c9d 03/12: Allow to customize the sorting methods, Oleh Krehel, 2015/04/21
- [elpa] master 94c124d 07/12: ivy.el (ivy-done): Don't directory-expand glob filename, Oleh Krehel, 2015/04/21
- [elpa] master 5268d10 06/12: Add an option to call the completion action without exiting, Oleh Krehel, 2015/04/21
- [elpa] master 9d5b60f 09/12: ivy.el (ivy--regex): Add optional greedy arg, Oleh Krehel, 2015/04/21
- [elpa] master be716a1 08/12: swiper.el (swiper--add-overlays): Update arglist, Oleh Krehel, 2015/04/21
- [elpa] master b724678 10/12: counsel.el: Add awesome swiper highlighting to git grep, Oleh Krehel, 2015/04/21
- [elpa] master 675bd5f 11/12: Fix describe-function / -variable "C-." interaction,
Oleh Krehel <=
- [elpa] master e86b27e 12/12: Merge commit '675bd5ff97f75fb7d838e6056442ce71adf85e56' from swiper, Oleh Krehel, 2015/04/21