aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lamb2012-01-23 00:18:22 -0800
committerGlenn Morris2012-01-23 00:18:22 -0800
commitd7128bb16449d0b4f0d9735bed049cf5e03d61e9 (patch)
tree363b76a2f4a2b268c73e799e29329d31d8a75532
parent802a2ae21ff07fa801aa8de843a9b9d496fb459a (diff)
downloademacs-d7128bb16449d0b4f0d9735bed049cf5e03d61e9.tar.gz
emacs-d7128bb16449d0b4f0d9735bed049cf5e03d61e9.zip
* lisp/eshell/esh-util.el (pcomplete/ssh): Remove alias. (tiny change)
There is a better pcomplete/ssh defined in pcmpl-unix.el. Fixes: debbugs:10548
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/eshell/em-unix.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 297043fa12b..97281db4c7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,8 @@
3 * eshell/esh-util.el (eshell-read-hosts-file): 3 * eshell/esh-util.el (eshell-read-hosts-file):
4 Skip comment lines. (Bug#10549) 4 Skip comment lines. (Bug#10549)
5 5
6 * eshell/em-unix.el (pcomplete/ssh): Remove. (Bug#10548)
7
62012-01-23 Juanma Barranquero <lekktu@gmail.com> 82012-01-23 Juanma Barranquero <lekktu@gmail.com>
7 9
8 * subr.el (display-delayed-warnings): Doc fix. 10 * subr.el (display-delayed-warnings): Doc fix.
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index f24180b5c7f..296e2ee8b24 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -792,8 +792,6 @@ external command."
792 (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1)) 792 (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1))
793 pcomplete-default-completion-function))) 793 pcomplete-default-completion-function)))
794 794
795(defalias 'pcomplete/ssh 'pcomplete/rsh)
796
797(defvar block-size) 795(defvar block-size)
798(defvar by-bytes) 796(defvar by-bytes)
799(defvar dereference-links) 797(defvar dereference-links)