[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4470110 101/177: display-fn isn't actually used for filter
From: |
João Távora |
Subject: |
[elpa] master 4470110 101/177: display-fn isn't actually used for filtering |
Date: |
Sat, 28 Mar 2015 15:41:13 +0000 |
branch: master
commit 44701103845fc4ae660e1587748ec661dca3b98d
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
display-fn isn't actually used for filtering
---
yasnippet.el | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index f585b88..d21f3cb 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1600,28 +1600,22 @@ Optional PROMPT sets the prompt to use."
(defun yas-dropdown-prompt (_prompt choices &optional display-fn)
(when (fboundp 'dropdown-list)
- (let* ((formatted-choices (if display-fn (delete-if-not display-fn choices)
- choices))
- (filtered-choices (if display-fn (mapcar display-fn
filtered-choices)
- choices))
- (n (and formatted-choices
- (dropdown-list formatted-choices))))
- (if n
- (nth n filtered-choices)
+ (let* ((formatted-choices
+ (if display-fn (mapcar display-fn choices) choices))
+ (n (dropdown-list formatted-choices)))
+ (if n (nth n choices)
(keyboard-quit)))))
(defun yas-completing-prompt (prompt choices &optional display-fn
completion-fn)
- (let* ((formatted-choices (if display-fn (delete-if-not display-fn choices)
- choices))
- (filtered-choices (if display-fn (mapcar display-fn filtered-choices)
- choices))
- (chosen (and formatted-choices
- (funcall (or completion-fn #'completing-read)
- prompt formatted-choices
- nil 'require-match nil nil)))
- (position (and chosen
- (position chosen formatted-choices :test #'string=))))
- (nth (or position 0) filtered-choices)))
+ (let* ((formatted-choices
+ (if display-fn (mapcar display-fn choices) choices))
+ (chosen (funcall (or completion-fn #'completing-read)
+ prompt formatted-choices
+ nil 'require-match nil nil)))
+ (if (eq choices formatted-choices)
+ chosen
+ (nth (or (position chosen formatted-choices :test #'string=) 0)
+ choices))))
(defun yas-no-prompt (_prompt choices &optional _display-fn)
(first choices))
- [elpa] master f94c38e 091/177: Merge pull request #449 from nibua-r/https-submodules, (continued)
- [elpa] master f94c38e 091/177: Merge pull request #449 from nibua-r/https-submodules, João Távora, 2015/03/28
- [elpa] master 3002043 093/177: Sync git submodule for yasmate repo, João Távora, 2015/03/28
- [elpa] master 0f8c2ab 094/177: Add `yas-after-reload-hook' and run it at the end of `yas-reload-all', João Távora, 2015/03/28
- [elpa] master 987942c 095/177: update snippets submodule, João Távora, 2015/03/28
- [elpa] master c128580 096/177: yasnippet templates don't add newlines, João Távora, 2015/03/28
- [elpa] master 83c174c 097/177: Merge pull request #464 from kidd/master, João Távora, 2015/03/28
- [elpa] master 12b7f82 092/177: Add Travis CI and update tests. Start a Changelog., João Távora, 2015/03/28
- [elpa] master 3744f92 098/177: avoid double choices reversing, João Távora, 2015/03/28
- [elpa] master 1fc858f 099/177: Remove experimental Changelog file, João Távora, 2015/03/28
- [elpa] master 4d220f7 100/177: Remove an obsolete hack notice, João Távora, 2015/03/28
- [elpa] master 4470110 101/177: display-fn isn't actually used for filtering,
João Távora <=
- [elpa] master c07db05 102/177: yas-x-prompt: remove dead code, João Távora, 2015/03/28
- [elpa] master 43a501a 103/177: remove yas--x-pretty-prompt-templates, João Távora, 2015/03/28
- [elpa] master 8e7295b 108/177: Closes #403: more uniform behaviour for `yas-use-menu', João Távora, 2015/03/28
- [elpa] master 498cbe4 105/177: Closes #469: Don't use `yas--init-minor-keymap', João Távora, 2015/03/28
- [elpa] master e7599b9 104/177: Merge pull request #466 from npostavs/no-reverse, João Távora, 2015/03/28
- [elpa] master a4e04f9 109/177: update doc for org 8.x, João Távora, 2015/03/28
- [elpa] master a0c2217 110/177: Merge pull request #473 from npostavs/org8, João Távora, 2015/03/28
- [elpa] master b36a4f7 107/177: Properly closes #469: Don't use `yas--init-minor-keymap', João Távora, 2015/03/28
- [elpa] master d809e88 106/177: Revert "Closes #469: Don't use `yas--init-minor-keymap'", João Távora, 2015/03/28
- [elpa] master 599a262 113/177: Closes #474: fix cc-mode fontification conflict, João Távora, 2015/03/28