mirror of
https://github.com/joaotavora/yasnippet.git
synced 2025-10-13 13:13:03 +00:00
Merge pull request #377 from tarsius/master
do not require dropdown-list at compile time
This commit is contained in:
commit
742b353a81
@ -110,9 +110,9 @@
|
|||||||
;; are to be displayed, or all the tables for all major
|
;; are to be displayed, or all the tables for all major
|
||||||
;; modes.
|
;; modes.
|
||||||
;;
|
;;
|
||||||
;; The `dropdown-list.el' extension is bundled with YASnippet, you
|
;; If you have `dropdown-list' installed, you can optionally use it
|
||||||
;; can optionally use it the preferred "prompting method", putting in
|
;; as the preferred "prompting method", putting in your .emacs file,
|
||||||
;; your .emacs file, for example:
|
;; for example:
|
||||||
;;
|
;;
|
||||||
;; (require 'dropdown-list)
|
;; (require 'dropdown-list)
|
||||||
;; (setq yas-prompt-functions '(yas-dropdown-prompt
|
;; (setq yas-prompt-functions '(yas-dropdown-prompt
|
||||||
@ -1606,7 +1606,7 @@ Optional PROMPT sets the prompt to use."
|
|||||||
ido-mode))
|
ido-mode))
|
||||||
(yas-completing-prompt prompt choices display-fn #'ido-completing-read)))
|
(yas-completing-prompt prompt choices display-fn #'ido-completing-read)))
|
||||||
|
|
||||||
(eval-when-compile (require 'dropdown-list nil t))
|
(declare-function dropdown-list "dropdown-list")
|
||||||
(defun yas-dropdown-prompt (prompt choices &optional display-fn)
|
(defun yas-dropdown-prompt (prompt choices &optional display-fn)
|
||||||
(when (featurep 'dropdown-list)
|
(when (featurep 'dropdown-list)
|
||||||
(let (formatted-choices
|
(let (formatted-choices
|
||||||
|
Loading…
x
Reference in New Issue
Block a user