[Emacs-diffs] /srv/bzr/emacs/trunk r111072: * lisp/url/url-misc.el (url-do-terminal-emulator): Use make-term

[Chong Yidong]

------------------------------------------------------------
revno: 111072
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-12-03 14:23:06 +0800
message:
  * lisp/url/url-misc.el (url-do-terminal-emulator): Use make-term
  instead of terminal-emulator.
modified:
  lisp/url/ChangeLog
  lisp/url/url-misc.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-10-13 10:51:26 +0000
+++ b/lisp/url/ChangeLog        2012-12-03 06:23:06 +0000
@@ -1,3 +1,8 @@
+2012-12-03  Chong Yidong  <address@hidden>
+
+       * url-misc.el (url-do-terminal-emulator): Use make-term instead of
+       terminal-emulator.
+
 2012-10-13  Liam Stitt  <address@hidden>  (tiny change)
 
        * url-vars.el (url-uncompressor-alist):

=== modified file 'lisp/url/url-misc.el'
--- a/lisp/url/url-misc.el      2012-07-11 23:13:41 +0000
+++ b/lisp/url/url-misc.el      2012-12-03 06:23:06 +0000
@@ -44,27 +44,21 @@
     nil))
 
 (defun url-do-terminal-emulator (type server port user)
-  (terminal-emulator
-   (generate-new-buffer (format "%s%s" (if user (concat user "@") "") server))
-   (pcase type
-     (`rlogin "rlogin")
-     (`telnet "telnet")
-     (`tn3270 "tn3270")
-     (_
-      (error "Unknown terminal emulator required: %s" type)))
-   (pcase type
-     (`rlogin
-      (if user
-         (list server "-l" user)
-       (list server)))
-     (`telnet
-      (if user (message "Please log in as user: %s" user))
-      (if port
-         (list server port)
-       (list server)))
-     (`tn3270
-      (if user (message "Please log in as user: %s" user))
-      (list server)))))
+  (switch-to-buffer
+   (apply
+    'make-term
+    (format "%s%s" (if user (concat user "@") "") server)
+    (cond ((eq type 'rlogin) "rlogin")
+         ((eq type 'telnet) "telnet")
+         ((eq type 'tn3270) "tn3270")
+         (t (error "Unknown terminal emulator required: %s" type)))
+    nil
+    (cond ((eq type 'rlogin)
+          (if user (list server "-l" user) (list server)))
+         ((eq type 'telnet)
+          (if port (list server port) (list server)))
+         ((eq type 'tn3270)
+          (list server))))))
 
 ;;;###autoload
 (defun url-generic-emulator-loader (url)