From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicholas Maniscalco Newsgroups: gmane.emacs.bugs Subject: bug#1469: patch for term.el regression when dealing with long lines under bash Date: Fri, 26 Dec 2008 13:12:16 -0800 Message-ID: <495548B0.4060505@maniscalco.com> Reply-To: Nicholas Maniscalco , 1469@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070804010105080809060001" X-Trace: ger.gmane.org 1230326621 11381 80.91.229.12 (26 Dec 2008 21:23:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Dec 2008 21:23:41 +0000 (UTC) To: 1469@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Dec 26 22:24:47 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 1LGKAo-0001er-IE for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Dec 2008 22:24:46 +0100 Original-Received: from localhost ([127.0.0.1]:34215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LGK9b-0006ba-2b for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Dec 2008 16:23:31 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LGK9W-0006ai-JF for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2008 16:23:26 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LGK9U-0006aV-8U for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2008 16:23:25 -0500 Original-Received: from [199.232.76.173] (port=47164 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LGK9U-0006aS-35 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2008 16:23:24 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:55805) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LGK9T-0008Nk-MU for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2008 16:23:23 -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 mBQLNLoH018080; Fri, 26 Dec 2008 13:23:21 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id mBQLK3Sa016994; Fri, 26 Dec 2008 13:20:03 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Nicholas Maniscalco Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 26 Dec 2008 21:20:03 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 1469 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 1469-submit@emacsbugs.donarmstrong.com id=B1469.123032595015612 (code B ref 1469); Fri, 26 Dec 2008 21:20:03 +0000 Original-Received: (at 1469) by emacsbugs.donarmstrong.com; 26 Dec 2008 21:12:30 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from ip-10-251-119-180.localdomain (ec2-75-101-156-130.compute-1.amazonaws.com [75.101.156.130]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mBQLCNg8015606 for <1469@emacsbugs.donarmstrong.com>; Fri, 26 Dec 2008 13:12:24 -0800 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 05B4BC65DB for <1469@emacsbugs.donarmstrong.com>; Fri, 26 Dec 2008 13:12:17 -0800 (PST) User-Agent: Thunderbird 2.0.0.18 (X11/20081125) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Fri, 26 Dec 2008 16:23:25 -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:23500 Archived-At: This is a multi-part message in MIME format. --------------070804010105080809060001 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit (I sent this to the wrong list earlier. Resending to, hopefully, the right place this time.) Here's 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 --------------070804010105080809060001 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)) --------------070804010105080809060001--