[Emacs-diffs] /srv/bzr/emacs/trunk r112783: In Eshell, replace obsolete lisp-complete-symbol

[Glenn Morris]

------------------------------------------------------------
revno: 112783
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-29 20:27:46 -0700
message:
  In Eshell, replace obsolete lisp-complete-symbol
  
  * 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.
modified:
  lisp/ChangeLog
  lisp/eshell/em-cmpl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-30 03:24:30 +0000
+++ b/lisp/ChangeLog    2013-05-30 03:27:46 +0000
@@ -1,5 +1,9 @@
 2013-05-30  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el    2013-05-23 04:57:27 +0000
+++ b/lisp/eshell/em-cmpl.el    2013-05-30 03:27:46 +0000
@@ -243,6 +243,12 @@
 
 ;;; 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 @@
               (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 @@
               (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")