mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 19:30:38 -08:00
Code Issues Projects Releases Wiki Activity

Silence ielm compilation

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2013-05-29 20:30:34 -07:00
parent 2082faa6de
commit d209d4a9b3
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,5 +1,11 @@
2013-05-30 Glenn Morris <rgm@gnu.org> 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/em-cmpl.el (eshell-complete-lisp-symbol): New function.
(eshell-cmpl-initialize, eshell-complete-parse-arguments): (eshell-cmpl-initialize, eshell-complete-parse-arguments):
Replace obsolete lisp-complete-symbol with eshell-complete-lisp-symbol. Replace obsolete lisp-complete-symbol with eshell-complete-lisp-symbol.

15
lisp/ielm.el
View file

@ -167,7 +167,7 @@ This variable is buffer-local.")
(defvar ielm-map (defvar ielm-map
(let ((map (make-sparse-keymap))) (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-m" 'ielm-return)
(define-key map "\C-j" 'ielm-send-input) (define-key map "\C-j" 'ielm-send-input)
(define-key map "\e\C-x" 'eval-defun) ; for consistency with (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 (defun ielm-complete-symbol nil
"Complete the Lisp symbol before point." "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 ;; completion has occurred
(let* ((btick (buffer-modified-tick)) (let* ((btick (buffer-modified-tick))
(cbuffer (get-buffer "*Completions*")) (cbuffer (get-buffer "*Completions*"))
(ctick (and cbuffer (buffer-modified-tick cbuffer)))) (ctick (and cbuffer (buffer-modified-tick cbuffer)))
(lisp-complete-symbol) (completion-at-point-functions '(lisp-completion-at-point)))
(completion-at-point)
;; completion has occurred if: ;; completion has occurred if:
(or (or
;; the buffer has been modified ;; 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 Inputs longer than one line are moved to the line following the
prompt (but see variable `ielm-dynamic-multiline-inputs'). 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. or indents the line if there is nothing to complete.
The current working buffer may be changed (with a call to `set-buffer', 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) (set (make-local-variable 'paragraph-start) comint-prompt-regexp)
(setq comint-input-sender 'ielm-input-sender) (setq comint-input-sender 'ielm-input-sender)
(setq comint-process-echoes nil) (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-tab comint-replace-by-expanded-history
ielm-complete-filename ielm-complete-symbol)) ielm-complete-filename ielm-complete-symbol))
(set (make-local-variable 'ielm-prompt-internal) ielm-prompt) (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 'indent-line-function) 'ielm-indent-line)
(set (make-local-variable 'ielm-working-buffer) (current-buffer)) (set (make-local-variable 'ielm-working-buffer) (current-buffer))
(set (make-local-variable 'fill-paragraph-function) 'lisp-fill-paragraph) (set (make-local-variable 'fill-paragraph-function) 'lisp-fill-paragraph)
(add-hook 'completion-at-point-functions
'lisp-completion-at-point nil 'local)
;; Value holders ;; Value holders
(set (make-local-variable '*) nil) (set (make-local-variable '*) nil)