From: Glenn Morris <rgm@gnu.org>
Date: Thu, 30 May 2013 03:30:34 +0000 (-0700)
Subject: Silence ielm compilation
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~129
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d209d4a9b383c553892d58d0517123e275232a9c;p=emacs.git

Silence ielm compilation

* lisp/ielm.el (ielm-map, ielm-complete-symbol):
Use completion-at-point rather than obsolete functions.
(inferior-emacs-lisp-mode): Doc fix.
Set completion-at-point-functions, rather than
comint-dynamic-complete-functions.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81ec34951b2..14c48383655 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2013-05-30  Glenn Morris  <rgm@gnu.org>
 
+	* ielm.el (ielm-map, ielm-complete-symbol):
+	Use completion-at-point rather than obsolete functions.
+	(inferior-emacs-lisp-mode): Doc fix.
+	Set completion-at-point-functions, rather than
+	comint-dynamic-complete-functions.
+
 	* eshell/em-cmpl.el (eshell-complete-lisp-symbol): New function.
 	(eshell-cmpl-initialize, eshell-complete-parse-arguments):
 	Replace obsolete lisp-complete-symbol with eshell-complete-lisp-symbol.
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 610cc3ea364..4280a49af6e 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -167,7 +167,7 @@ This variable is buffer-local.")
 
 (defvar ielm-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "\t" 'comint-dynamic-complete)
+    (define-key map "\t" 'completion-at-point)
     (define-key map "\C-m" 'ielm-return)
     (define-key map "\C-j" 'ielm-send-input)
     (define-key map "\e\C-x" 'eval-defun)         ; for consistency with
@@ -209,12 +209,13 @@ This variable is buffer-local.")
 
 (defun ielm-complete-symbol nil
   "Complete the Lisp symbol before point."
-  ;; A wrapper for lisp-complete symbol that returns non-nil if
+  ;; A wrapper for completion-at-point that returns non-nil if
   ;; completion has occurred
   (let* ((btick (buffer-modified-tick))
 	 (cbuffer (get-buffer "*Completions*"))
-	 (ctick (and cbuffer (buffer-modified-tick cbuffer))))
-    (lisp-complete-symbol)
+	 (ctick (and cbuffer (buffer-modified-tick cbuffer)))
+	 (completion-at-point-functions '(lisp-completion-at-point)))
+    (completion-at-point)
      ;; completion has occurred if:
     (or
      ;; the buffer has been modified
@@ -461,7 +462,7 @@ Uses the interface provided by `comint-mode' (which see).
   Inputs longer than one line are moved to the line following the
   prompt (but see variable `ielm-dynamic-multiline-inputs').
 
-* \\[comint-dynamic-complete] completes Lisp symbols (or filenames, within strings),
+* \\[completion-at-point] completes Lisp symbols (or filenames, within strings),
   or indents the line if there is nothing to complete.
 
 The current working buffer may be changed (with a call to `set-buffer',
@@ -498,7 +499,7 @@ Customized bindings may be defined in `ielm-map', which currently contains:
   (set (make-local-variable 'paragraph-start) comint-prompt-regexp)
   (setq comint-input-sender 'ielm-input-sender)
   (setq comint-process-echoes nil)
-  (set (make-local-variable 'comint-dynamic-complete-functions)
+  (set (make-local-variable 'completion-at-point-functions)
        '(ielm-tab comint-replace-by-expanded-history
 	 ielm-complete-filename ielm-complete-symbol))
   (set (make-local-variable 'ielm-prompt-internal) ielm-prompt)
@@ -513,8 +514,6 @@ Customized bindings may be defined in `ielm-map', which currently contains:
   (set (make-local-variable 'indent-line-function) 'ielm-indent-line)
   (set (make-local-variable 'ielm-working-buffer) (current-buffer))
   (set (make-local-variable 'fill-paragraph-function) 'lisp-fill-paragraph)
-  (add-hook 'completion-at-point-functions
-            'lisp-completion-at-point nil 'local)
 
   ;; Value holders
   (set (make-local-variable '*) nil)