[Emacs-diffs] Changes to emacs/lisp/net/telnet.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/10 16:08:49

Index: lisp/net/telnet.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/telnet.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- lisp/net/telnet.el  6 May 2008 07:31:48 -0000       1.22
+++ lisp/net/telnet.el  10 Jun 2008 16:08:46 -0000      1.23
@@ -159,8 +159,7 @@
     (comint-send-string proc telnet-new-line)))
 
 (defun telnet-filter (proc string)
-  (save-excursion
-    (set-buffer (process-buffer proc))
+  (with-current-buffer (process-buffer proc)
     (let* ((last-insertion (marker-position (process-mark proc)))
           (delta (- (point) last-insertion))
           (ie (and comint-last-input-end
@@ -168,7 +167,7 @@
           (w (get-buffer-window (current-buffer)))
           (ws (and w (window-start w))))
       (goto-char last-insertion)
-      (insert-before-markers string)
+      (insert string)
       (set-marker comint-last-output-start last-insertion)
       (set-marker (process-mark proc) (point))
       (if ws (set-window-start w ws t))
@@ -245,6 +244,7 @@
 There is a variable ``telnet-interrupt-string'' which is the character
 sent to try to stop execution of a job on the remote host.
 Data is sent to the remote host when RET is typed."
+  (set (make-local-variable 'window-point-insertion-type) t)
   (set (make-local-variable 'comint-prompt-regexp) telnet-prompt-pattern)
   (set (make-local-variable 'comint-use-prompt-regexp) t))