summaryrefslogtreecommitdiff
path: root/elisp/geiser-completion.el
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2020-02-13 02:39:35 +0000
committerJose Antonio Ortega Ruiz <jao@gnu.org>2020-02-13 02:39:35 +0000
commit58aaace4ef59ac55fb61b49b681307231c8fd1e3 (patch)
tree1f27de69a775b629fb92388da9fe96d8cbe0e61c /elisp/geiser-completion.el
parentb134d0620d4f38e544c76e8f756f3f0428c5143e (diff)
downloadgeiser-guile-58aaace4ef59ac55fb61b49b681307231c8fd1e3.tar.gz
geiser-guile-58aaace4ef59ac55fb61b49b681307231c8fd1e3.tar.bz2
Compatibility with Helm completions in emacs-25 (fixes #271)
Diffstat (limited to 'elisp/geiser-completion.el')
-rw-r--r--elisp/geiser-completion.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index 765b456..9c979f1 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -1,6 +1,6 @@
;;; geiser-completion.el -- tab completion
-;; Copyright (C) 2009, 2010, 2011, 2012, 2018 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2012, 2018, 2020 Jose Antonio Ortega Ruiz
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the Modified BSD License. You should
@@ -61,10 +61,16 @@
(defsubst geiser-completion--module-list (prefix)
(geiser-eval--send/result `(:eval (:ge module-completions ,prefix))))
+(defvar geiser-completion--module-list-func
+ (cond ((< emacs-major-version 25)
+ (completion-table-dynamic 'geiser-completion--symbol-list))
+ ((= emacs-major-version 25)
+ (completion-table-dynamic 'geiser-completion--module-list t))
+ (t (completion-table-dynamic 'geiser-completion--module-list))))
+
(defvar geiser-completion-symbol-list-func
(if (< emacs-major-version 25)
- (completion-table-dynamic 'geiser-completion--symbol-list)
- (completion-table-dynamic 'geiser-completion--symbol-list t)))
+ (completion-table-dynamic 'geiser-completion--symbol-list t)))
(defvar geiser-completion-module-list-func
(if (< emacs-major-version 25)