From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicholas Maniscalco Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#1699: patch for bug#1469 (term.el regression when dealing with long lines under bash) Date: Wed, 24 Dec 2008 20:19:00 -0800 Message-ID: <495309B4.9030506@maniscalco.com> Reply-To: Nicholas Maniscalco , 1699@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060806020406070604080104" X-Trace: ger.gmane.org 1230217941 13660 80.91.229.12 (25 Dec 2008 15:12:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 25 Dec 2008 15:12:21 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 25 16:13:28 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LFrtw-0005TC-7x for geb-bug-gnu-emacs@m.gmane.org; Thu, 25 Dec 2008 16:13:28 +0100 Original-Received: from localhost ([127.0.0.1]:37173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LFrsi-0000Y8-Tb for geb-bug-gnu-emacs@m.gmane.org; Thu, 25 Dec 2008 10:12:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LFigv-0006kM-QV for bug-gnu-emacs@gnu.org; Thu, 25 Dec 2008 00:23:25 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LFigt-0006kA-AF for bug-gnu-emacs@gnu.org; Thu, 25 Dec 2008 00:23:24 -0500 Original-Received: from [199.232.76.173] (port=44185 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LFigt-0006k7-4s for bug-gnu-emacs@gnu.org; Thu, 25 Dec 2008 00:23:23 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:39222) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LFigs-0007ib-KE for bug-gnu-emacs@gnu.org; Thu, 25 Dec 2008 00:23:22 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mBP5NKZn032647; Wed, 24 Dec 2008 21:23:20 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id mBP5554c028025; Wed, 24 Dec 2008 21:05:05 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Nicholas Maniscalco Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Thu, 25 Dec 2008 05:05:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 1699 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.123018095325914 (code B ref -1); Thu, 25 Dec 2008 05:05:05 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 25 Dec 2008 04:55:53 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mBP4tnn7025908 for ; Wed, 24 Dec 2008 20:55:51 -0800 Original-Received: from mx10.gnu.org ([199.232.76.166]:56875) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1LFiFJ-0000zK-VU for emacs-pretest-bug@gnu.org; Wed, 24 Dec 2008 23:54:54 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1LFiGC-0006Jz-3U for emacs-pretest-bug@gnu.org; Wed, 24 Dec 2008 23:55:48 -0500 Original-Received: from ec2-75-101-156-130.compute-1.amazonaws.com ([75.101.156.130]:38518 helo=ip-10-251-119-180.localdomain) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LFiGB-0006JX-R6 for emacs-pretest-bug@gnu.org; Wed, 24 Dec 2008 23:55:47 -0500 Original-Received: from [192.168.1.5] (unknown [63.231.57.106]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: njm) by ip-10-251-119-180.localdomain (Postfix) with ESMTP id 40D67C65CD for ; Wed, 24 Dec 2008 20:19:02 -0800 (PST) User-Agent: Thunderbird 2.0.0.18 (X11/20081125) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Greylist: delayed 2200 seconds by postgrey-1.27 at monty-python; Wed, 24 Dec 2008 23:55:43 EST X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Thu, 25 Dec 2008 00:23:24 -0500 X-Mailman-Approved-At: Thu, 25 Dec 2008 10:12:09 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:23488 gmane.emacs.pretest.bugs:23556 Archived-At: This is a multi-part message in MIME format. --------------060806020406070604080104 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hello, attached is a patch for bug#1469 (term.el regression when dealing with long lines under bash). * term.el (term-emulate-terminal): Decode substring just prior to inserting it. (Bug#1469) bug#1469 was introduced while fixing bug#1006. I verified this patch against the repro steps in bug#1006 to make sure I haven't made a regression. Can someone please review? I'd appreciate any feedback. -- Nicholas --------------060806020406070604080104 Content-Type: text/x-patch; name="term.el.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="term.el.patch" Index: lisp/term.el =================================================================== RCS file: /sources/emacs/emacs/lisp/term.el,v retrieving revision 1.107 diff -c -p -r1.107 term.el *** lisp/term.el 3 Dec 2008 05:48:33 -0000 1.107 --- lisp/term.el 25 Dec 2008 03:45:24 -0000 *************** See `term-prompt-regexp'." *** 2834,2840 **** ;; following point if not eob nor insert-mode. (let ((old-column (current-column)) columns pos) ! (insert decoded-substring) (setq term-current-column (current-column) columns (- term-current-column old-column)) (when (not (or (eobp) term-insert-mode)) --- 2834,2840 ---- ;; following point if not eob nor insert-mode. (let ((old-column (current-column)) columns pos) ! (insert (decode-coding-string (substring str i funny) locale-coding-system)) (setq term-current-column (current-column) columns (- term-current-column old-column)) (when (not (or (eobp) term-insert-mode)) --------------060806020406070604080104--