CVS update by stephent packages/xemacs-packages/xemacs-base ...

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/04/16 16:47:29

  Modified:    packages/xemacs-packages/xemacs-base comint.el ChangeLog
Log:
Partial fix for comint-carriage-motion. <87slb0tlzx.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.21      +9 -1      XEmacs/packages/xemacs-packages/xemacs-base/comint.el

Index: comint.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/comint.el,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- comint.el	2007/03/07 04:18:40	1.20
+++ comint.el	2007/04/16 14:47:25	1.21
@@ -1692,7 +1692,10 @@ either globally or locally.")
 ;; XEmacs change: don't interpret carriage control characters by default
 (defvar comint-inhibit-carriage-motion t
   "If nil, Comint will interpret `carriage control' characters in output.
-See `comint-carriage-motion' for details.")
+See `comint-carriage-motion' for details..
+Note: currently this does not work perfectly.  Specifically a bare ASCII
+CR will usually, but not always, result in the current line being erased
+(giving the effect of overwriting it).")
 
 ;; When non-nil, this is an extent over the last recognized prompt in
 ;; the buffer; it is used when highlighting the prompt.
@@ -1790,6 +1793,11 @@ Make backspaces delete the previous char
 	  (force-mode-line-update)
 
 	  (unless comint-inhibit-carriage-motion
+	    ;; oend needs to be adjusted if the buffer content is changed.
+	    ;; Specifically, an error occurs if oend points beyond EOB.
+	    ;; Use of a marker seems to (mostly) work (see docstring of
+	    ;; `comint-inhibit-carriage-motion').
+	    (setq oend (copy-marker oend))
 	    ;; Interpret any carriage motion characters (newline, backspace)
 	    (comint-carriage-motion comint-last-output-start (point)))
 



1.195     +5 -0      XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- ChangeLog	2007/03/07 07:28:47	1.194
+++ ChangeLog	2007/04/16 14:47:25	1.195
@@ -1,3 +1,8 @@
+2007-04-02  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* comint.el (comint-output-filter): Avoid error if filter deletes.
+	(comint-inhibit-carriage-motion): Comment on remaining bug.
+
 2007-03-07  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 2.09 released.