master 0b94747ddc 1/2: Make pcomplete/{rsh, rlogin} into alias for pcomplete/ssh

[Stefan Kangas]

branch: master
commit 0b94747ddc0391205b921adb5f3b6b488cca6b59
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Make pcomplete/{rsh,rlogin} into alias for pcomplete/ssh
    
    * lisp/pcmpl-unix.el (pcomplete/rlogin, pcomplete/rsh): Make into
    aliases for 'pcomplete/ssh', as "rsh" and "rlogin" is more often than
    not aliases for "ssh" on modern machines.
---
 lisp/pcmpl-unix.el | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 0074722be7..8774f091c8 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -197,6 +197,10 @@ Uses both `pcmpl-ssh-config-file' and 
`pcmpl-ssh-known-hosts-file'."
   (pcomplete-opt "1246AaCfgKkMNnqsTtVvXxYbcDeFiLlmOopRSw")
   (pcomplete-here (pcmpl-ssh-hosts)))
 
+;;;###autoload
+(defalias 'pcomplete/rsh    #'pcomplete/ssh)
+(defalias 'pcomplete/rlogin #'pcomplete/ssh)
+
 ;;;###autoload
 (defun pcomplete/scp ()
   "Completion rules for the `scp' command.
@@ -229,22 +233,12 @@ Includes files as well as host names followed by a colon."
 (defalias 'pcomplete/ftp    'pcmpl-unix-complete-hostname)
 (defalias 'pcomplete/ncftp  'pcmpl-unix-complete-hostname)
 (defalias 'pcomplete/ping   'pcmpl-unix-complete-hostname)
-(defalias 'pcomplete/rlogin 'pcmpl-unix-complete-hostname)
 
 ;;;###autoload
 (defun pcomplete/telnet ()
   (pcomplete-opt "xl(pcmpl-unix-user-names)")
   (pcmpl-unix-complete-hostname))
 
-;;;###autoload
-(defun pcomplete/rsh ()
-  "Complete `rsh', which, after the user and hostname, is like xargs."
-  (pcomplete-opt "l(pcmpl-unix-user-names)")
-  (pcmpl-unix-complete-hostname)
-  (pcomplete-here (funcall pcomplete-command-completion-function))
-  (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1))
-               pcomplete-default-completion-function)))
-
 (provide 'pcmpl-unix)
 
 ;;; pcmpl-unix.el ends here