2 files changed, 27 insertions, 6 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index 367f40d6f8e..1dbf8321bf3 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -558,6 +558,24 @@ The optional second argument PARAMETERS specifies additional frame parameters."
       (error "Invalid display, not HOST:SERVER or HOST:SERVER.SCREEN"))
   (make-frame (cons (cons 'display display) parameters)))
 
+;;;###autoload
+(defun make-frame-on-tty (device type &optional parameters)
+  "Make a frame on terminal DEVICE which is of type TYPE (e.g., \"xterm\").
+The optional third argument PARAMETERS specifies additional frame parameters.
+
+DEVICE must be a proxy psudo terminal created by emacsclient,
+otherwise there will be problems with terminal input and window
+resizes. (The kernel notifies processes about pending input or
+terminal resizes only on the controlling terminal, so we need
+emacsclient to sit on the real terminal device, create SIGIO
+signals upon terminal input, and forward SIGWINCH signals to
+us.)"
+  (unless device
+    (error "Invalid terminal device"))
+  (unless type
+    (error "Invalid terminal type"))
+  (make-frame `((tty . ,device) (tty-type . ,type) . ,parameters)))
+
 (defun make-frame-command ()
   "Make a new frame, and select it if the terminal displays only one frame."
   (interactive)
diff --git a/lisp/server.el b/lisp/server.el
index f2c1fc9ce2a..9721dbc4a41 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -345,12 +345,15 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
             (if coding-system
                 (setq arg (decode-coding-string arg coding-system)))
             (if eval
-                (let ((v (eval (car (read-from-string arg)))))
-                  (when v
-                    (with-temp-buffer
-                      (let ((standard-output (current-buffer)))
-                        (pp v)
-                        (process-send-region proc (point-min) (point-max))))))
+                (condition-case err
+                    (let ((v (eval (car (read-from-string arg)))))
+                      (when v
+                        (with-temp-buffer
+                          (let ((standard-output (current-buffer)))
+                            (pp v)
+                            (process-send-region proc (point-min) (point-max))))))
+                  (error (process-send-string proc (concat "*Error* " (error-message-string err)))))
+
               ;; ARG is a file name.
               ;; Collapse multiple slashes to single slashes.
               (setq arg (command-line-normalize-file-name arg))