procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In Eshell, replace obsolete lisp-complete-symbol

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

4
lisp/ChangeLog
View file

@ -1,5 +1,9 @@
2013-05-30 Glenn Morris <rgm@gnu.org>
* 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.
* image.el (image-animated-p): Tweak definition.
* net/rlogin.el (rlogin-program, rlogin-explicit-args): Default to ssh.

12
lisp/eshell/em-cmpl.el
View file

@ -243,6 +243,12 @@ to writing a completion function."
;;; Functions:
(defun eshell-complete-lisp-symbol ()
"Try to complete the text around point as a Lisp symbol."
(interactive)
(let ((completion-at-point-functions '(lisp-completion-at-point)))
(completion-at-point)))
(defun eshell-cmpl-initialize ()
"Initialize the completions module."
(set (make-local-variable 'pcomplete-command-completion-function)
@ -288,8 +294,8 @@ to writing a completion function."
(set (make-local-variable 'pcomplete-arg-quote-list)
eshell-special-chars-outside-quoting))) nil t)
(add-hook 'pcomplete-quote-arg-hook 'eshell-quote-backslash nil t)
(define-key eshell-mode-map [(meta tab)] 'lisp-complete-symbol)
(define-key eshell-mode-map [(meta control ?i)] 'lisp-complete-symbol)
(define-key eshell-mode-map [(meta tab)] 'eshell-complete-lisp-symbol)
(define-key eshell-mode-map [(meta control ?i)] 'eshell-complete-lisp-symbol)
(define-key eshell-command-map [(meta ?h)] 'eshell-completion-help)
(define-key eshell-command-map [tab] 'pcomplete-expand-and-complete)
(define-key eshell-command-map [(control ?i)]
@ -347,7 +353,7 @@ to writing a completion function."
(setq begin (1+ (cadr delim))
args (eshell-parse-arguments begin end)))
((eq (car delim) ?\()
(lisp-complete-symbol)
(eshell-complete-lisp-symbol)
(throw 'pcompleted t))
(t
(insert-and-inherit "\t")