RE: FW: comint.el fix

[Marshall, Simon]

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:address@hidden
Sent: 22 June 2003 04:01
To: Marshall, Simon
Cc: address@hidden; address@hidden
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.