[nongnu] elpa/gnuplot 21f9046 135/184: Bind appropriate completion command in comint mode

[ELPA Syncer]

branch: elpa/gnuplot
commit 21f9046e3f5caad41b750b5c9cee02fa4fd20fb9
Author: joddie <jonxfield@gmail.com>
Commit: joddie <jonxfield@gmail.com>

    Bind appropriate completion command in comint mode
---
 gnuplot.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnuplot.el b/gnuplot.el
index 97a8653..3b50c7f 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -2251,8 +2251,13 @@ buffer."
 (define-key gnuplot-comint-mode-map "\M-\C-p"  'gnuplot-plot-from-comint)
 (define-key gnuplot-comint-mode-map "\M-\C-f"  
'gnuplot-save-and-plot-from-comint)
 (define-key gnuplot-comint-mode-map "\C-d"     'gnuplot-delchar-or-maybe-eof)
-(define-key gnuplot-comint-mode-map "\M-\r"    'comint-dynamic-complete)
-(define-key gnuplot-comint-mode-map "\M-\t"    'comint-dynamic-complete)
+(let ((completion-function
+       (if (and (>= emacs-major-version 24)
+                (>= emacs-minor-version 1))
+           'completion-at-point
+         'comint-dynamic-complete)))
+  (define-key gnuplot-comint-mode-map "\M-\r"  completion-function)
+  (define-key gnuplot-comint-mode-map "\M-\t"  completion-function))
 (define-key gnuplot-comint-mode-map "\C-c\C-d"  'gnuplot-info-lookup-symbol)
 (define-key gnuplot-comint-mode-map "\C-c\C-w" 'gnuplot-show-version)
 (define-key gnuplot-comint-mode-map "\C-c\C-i" 'gnuplot-insert-filename)
@@ -2941,7 +2946,6 @@ distribution. See gnuplot-context.el for details."
         (load-library "gnuplot-context")
         (load-library "eldoc")
         (setq gnuplot-completion-at-point-function 
#'gnuplot-context-completion-at-point)
-        (define-key gnuplot-comint-mode-map (kbd "TAB") 
'comint-dynamic-complete)
 
         ;; Setup Eldoc
         (set (make-local-variable 'eldoc-documentation-function)