From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Marshall, Simon" Newsgroups: gmane.emacs.devel Subject: RE: FW: comint.el fix Date: Mon, 23 Jun 2003 11:23:55 +0100 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" X-Trace: main.gmane.org 1056364506 14167 80.91.224.249 (23 Jun 2003 10:35:06 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 23 Jun 2003 10:35:06 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Jun 23 12:35:04 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19UOfA-0003gN-00 for ; Mon, 23 Jun 2003 12:35:04 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19UOiB-0000RA-00 for ; Mon, 23 Jun 2003 12:38:11 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.20) id 19UOeP-0002nO-Pk for emacs-devel@quimby.gnus.org; Mon, 23 Jun 2003 06:34:17 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19UOcU-00026H-KN for emacs-devel@gnu.org; Mon, 23 Jun 2003 06:32:18 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19UOUd-0008CE-IK for emacs-devel@gnu.org; Mon, 23 Jun 2003 06:24:12 -0400 Original-Received: from mail14.messagelabs.com ([212.125.75.19]) by monty-python.gnu.org with smtp (Exim 4.20) id 19UOUU-00087Y-8j for emacs-devel@gnu.org; Mon, 23 Jun 2003 06:24:02 -0400 X-VirusChecked: Checked X-Env-Sender: simon.marshall@misys.com X-Msg-Ref: server-28.tower-14.messagelabs.com!1056363839!12480 Original-Received: (qmail 3908 invoked from network); 23 Jun 2003 10:23:59 -0000 Original-Received: from unknown (HELO pigeon.misys.com) (217.196.235.2) by server-28.tower-14.messagelabs.com with SMTP; 23 Jun 2003 10:23:59 -0000 Original-Received: From gull.misys.com ([10.80.48.7]) by pigeon.misys.com (WebShield SMTP v4.5 MR1a); id 1056363854406; Mon, 23 Jun 2003 11:24:14 +0100 Original-Received: by gull.midas-kapiti.com with Internet Mail Service (5.5.2653.19) id ; Mon, 23 Jun 2003 11:24:32 +0100 Original-To: "'rms@gnu.org'" X-Mailer: Internet Mail Service (5.5.2653.19) Original-cc: Gordon.Grimes@bcbsnc.com X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:15190 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:15190 It seems OK with my rudimentary testing, except: The second patch block should remove the setq of count (1+ count) in the same way as the first patch block does. I couldn't apply the third path block, but I don't think it's important. -----Original Message----- From: Richard Stallman [mailto:rms@gnu.org] Sent: 22 June 2003 04:01 To: Marshall, Simon Cc: emacs-devel@gnu.org; Gordon.Grimes@bcbsnc.com Subject: Re: FW: comint.el fix Is this the right fix? *** comint.el.~1.288.~ Tue Jun 3 07:07:46 2003 --- comint.el Sat Jun 21 18:11:50 2003 *************** *** 1344,1351 **** ;; Put the previous arg, if there was one, onto ARGS. (setq str (substring string beg pos) args (if quotes (cons str args) ! (nconc (comint-delim-arg str) args)) ! count (1+ count))) (setq quotes (match-beginning 1)) (setq beg (match-beginning 0)) (setq pos (match-end 0)))) --- 1344,1351 ---- ;; Put the previous arg, if there was one, onto ARGS. (setq str (substring string beg pos) args (if quotes (cons str args) ! (nconc (comint-delim-arg str) args)))) ! (setq count (length args)) (setq quotes (match-beginning 1)) (setq beg (match-beginning 0)) (setq pos (match-end 0)))) *************** *** 1354,1359 **** --- 1354,1360 ---- args (if quotes (cons str args) (nconc (comint-delim-arg str) args)) count (1+ count))) + (setq count (length args)) (let ((n (or nth (1- count))) (m (if mth (1- (- count mth)) 0))) (mapconcat *************** *** 2083,2090 **** (interactive) (comint-skip-input) (interrupt-process nil comint-ptyp) ! ;; (process-send-string nil "\n") ! ) (defun comint-kill-subjob () "Send kill signal to the current subjob. --- 2084,2090 ---- (interactive) (comint-skip-input) (interrupt-process nil comint-ptyp) ! (process-send-string nil "\n")) (defun comint-kill-subjob () "Send kill signal to the current subjob.