From xemacs-m  Sun Jun 15 14:22:27 1997
Received: from bittersweet.inetarena.com (karlheg@bittersweet.inetarena.com [206.129.216.38])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id OAA16465
	for <xemacs-beta@xemacs.org>; Sun, 15 Jun 1997 14:22:25 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.5/8.8.5) id MAA07731;
	Sun, 15 Jun 1997 12:22:38 -0700
Date: Sun, 15 Jun 1997 12:22:38 -0700
Message-Id: <199706151922.MAA07731@bittersweet.inetarena.com>
From: "Karl M. Hegbloom" <karlheg@inetarena.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: <xemacs-beta@xemacs.org>
Subject: [patch] comint/{comint,gdb-highlight,gdbsrc}.el
X-Mailer: VM 6.32 under 20.3 "Oslo" XEmacs Lucid (beta7)
X-Face: /Q}=yl}1_v7nP)xXo5XjG8+tl@=uVu7o5u6)f]zN?+<hB!K.m9:[|*p34jVN`O;:XZXVSy>/\R>qDt(t8w!-i{(y0"`jFw^uk8inzO9wXabd'CdjUWfC\GHi:6nO*YC89#-qD>Q4r%9!V"<RYJ=7D#$";q=zML5'!=wvXk^$`6FT=5CMofQX)WUKt0p:OKl.mFOXx/D


8<----------------------------------------------------------------->8
*** comint.el.orig	Sun Jun 15 12:13:00 1997
--- comint.el	Sun Jun 15 12:17:35 1997
***************
*** 1114,1120 ****
  	;; referenced with plings, with the range string to `comint-args'.
  	(setq comint-input-ring-index nil)
  	(goto-char (match-beginning 0))	; XEmacs
! 	(cond ((or (= (preceding-char) ?\\)
  		   (comint-within-quotes start (point)))
  	       ;; The history is quoted, or we're in quotes.
  	       (goto-char (match-end 0))) ; XEmacs
--- 1114,1120 ----
  	;; referenced with plings, with the range string to `comint-args'.
  	(setq comint-input-ring-index nil)
  	(goto-char (match-beginning 0))	; XEmacs
! 	(cond ((or (= (char-before (point)) ?\\)
  		   (comint-within-quotes start (point)))
  	       ;; The history is quoted, or we're in quotes.
  	       (goto-char (match-end 0))) ; XEmacs
***************
*** 2139,2145 ****
      (let ((non-word-chars (concat "[^\\\\" word-chars "]")) (here (point)))
        (while (and (re-search-backward non-word-chars nil 'move)
  		  ;(memq (char-after (point)) shell-file-name-quote-list)
! 		  (eq (preceding-char) ?\\))
  	(backward-char 1))
        ;; Don't go forward over a word-char (this can happen if we're at bob).
        (if (or (not (bobp)) (looking-at non-word-chars))
--- 2139,2145 ----
      (let ((non-word-chars (concat "[^\\\\" word-chars "]")) (here (point)))
        (while (and (re-search-backward non-word-chars nil 'move)
  		  ;(memq (char-after (point)) shell-file-name-quote-list)
! 		  (eq (char-before (point)) ?\\))
  	(backward-char 1))
        ;; Don't go forward over a word-char (this can happen if we're at bob).
        (if (or (not (bobp)) (looking-at non-word-chars))
*** gdb-highlight.el.orig	Sun Jun 15 12:13:12 1997
--- gdb-highlight.el	Sun Jun 15 12:19:21 1997
***************
*** 818,824 ****
  		  (end-of-line)
  		  (narrow-to-region p (point))
  		  (goto-char (match-end 0))
! 		  (if (= (following-char) ?\{)
  		      (progn
  			(forward-char 1)
  			(setq ok t))
--- 818,824 ----
  		  (end-of-line)
  		  (narrow-to-region p (point))
  		  (goto-char (match-end 0))
! 		  (if (= (char-after (point)) ?\{)
  		      (progn
  			(forward-char 1)
  			(setq ok t))
***************
*** 826,833 ****
  		    (setq ok (if (null p)
  				 nil
  			       (goto-char p)
! 			       (if (or (= (following-char) ?\,)
! 				       (= (following-char) ?\}))
  				   t
  				 (setq p (scan-sexps (point) 1 nil t))
  				 (if (null p)
--- 826,833 ----
  		    (setq ok (if (null p)
  				 nil
  			       (goto-char p)
! 			       (if (or (= (char-after (point)) ?\,)
! 				       (= (char-after (point)) ?\}))
  				   t
  				 (setq p (scan-sexps (point) 1 nil t))
  				 (if (null p)
***************
*** 859,868 ****
    (save-match-data
      (save-excursion
        (goto-char end)
!       (if (eq (preceding-char) ?\))
  	  (setq end (1- end)))
        (goto-char start)
!       (if (eq (following-char) ?\()
  	  (forward-char 1))
        (set-extent-property (make-extent start end) 'gdb-token type)
  
--- 859,868 ----
    (save-match-data
      (save-excursion
        (goto-char end)
!       (if (eq (char-before (point)) ?\))
  	  (setq end (1- end)))
        (goto-char start)
!       (if (eq (char-after (point)) ?\()
  	  (forward-char 1))
        (set-extent-property (make-extent start end) 'gdb-token type)
  
***************
*** 1161,1167 ****
  			      '(gdb-frame-number-token)))
  			(error "no frame-number extent on this line"))))
  	(goto-char (extent-start-position extent))
! 	(if (eq (following-char) ?#)
  	    (forward-char 1))
  	(setq number (string-to-int
  		      (buffer-substring (point)
--- 1161,1167 ----
  			      '(gdb-frame-number-token)))
  			(error "no frame-number extent on this line"))))
  	(goto-char (extent-start-position extent))
! 	(if (eq (char-after (point)) ?#)
  	    (forward-char 1))
  	(setq number (string-to-int
  		      (buffer-substring (point)
***************
*** 1203,1211 ****
  	(let ((done nil))
  	  (while (not done)
  	    (skip-chars-backward " \t")
! 	    (if (or (and (/= (preceding-char) ?\n)
! 			 (/= (preceding-char) ?\,)
! 			 (/= (preceding-char) ?\{))
  		    (<= (buffer-syntactic-context-depth) 0))
  		(setq done t)
  	      (let ((p (scan-lists (point) -1 1)))
--- 1203,1211 ----
  	(let ((done nil))
  	  (while (not done)
  	    (skip-chars-backward " \t")
! 	    (if (or (and (/= (char-before (point)) ?\n)
! 			 (/= (char-before (point)) ?\,)
! 			 (/= (char-before (point)) ?\{))
  		    (<= (buffer-syntactic-context-depth) 0))
  		(setq done t)
  	      (let ((p (scan-lists (point) -1 1)))
***************
*** 1215,1221 ****
  		  (cond
  		   ((looking-at " = {")
  		    (skip-chars-backward "a-zA-Z0-9_")
! 		    (if (= (preceding-char) ?\$)
  			(forward-char -1))
  		    (setq name (concat (buffer-substring (point) p) "." name)))
  
--- 1215,1221 ----
  		  (cond
  		   ((looking-at " = {")
  		    (skip-chars-backward "a-zA-Z0-9_")
! 		    (if (= (char-before (point)) ?\$)
  			(forward-char -1))
  		    (setq name (concat (buffer-substring (point) p) "." name)))
  
***************
*** 1231,1250 ****
  
  		      ;; up out of the list
  		      (skip-chars-backward " \t\n")
! 		      (if (= (preceding-char) ?\{)
  			  (forward-char -1))
  
  		      ;; we might be tightly nested in slot 0...
! 		      (while (= (preceding-char) ?\{)
  			(forward-char -1)
  			(setq name (concat "[0]" name)))
  
  		      (skip-chars-backward " \t")
! 		      (if (= (preceding-char) ?=) (forward-char -1))
  		      (skip-chars-backward " \t")
  		      (setq p (point))
  		      (skip-chars-backward "a-zA-Z0-9_")
! 		      (if (= (preceding-char) ?\$)
  			  (forward-char -1))
  
  		      (setq name (concat (buffer-substring (point) p) name))
--- 1231,1250 ----
  
  		      ;; up out of the list
  		      (skip-chars-backward " \t\n")
! 		      (if (= (char-before (point)) ?\{)
  			  (forward-char -1))
  
  		      ;; we might be tightly nested in slot 0...
! 		      (while (= (char-before (point)) ?\{)
  			(forward-char -1)
  			(setq name (concat "[0]" name)))
  
  		      (skip-chars-backward " \t")
! 		      (if (= (char-before (point)) ?=) (forward-char -1))
  		      (skip-chars-backward " \t")
  		      (setq p (point))
  		      (skip-chars-backward "a-zA-Z0-9_")
! 		      (if (= (char-before (point)) ?\$)
  			  (forward-char -1))
  
  		      (setq name (concat (buffer-substring (point) p) name))
***************
*** 1410,1416 ****
        ;; Extract the frame number (it may begin with "#".)
        (cond (fnumber
  	     (goto-char (extent-start-position fnumber))
! 	     (if (eq (following-char) ?#)
  		 (forward-char 1))
  	     (setq fnumber
  		   (string-to-int
--- 1410,1416 ----
        ;; Extract the frame number (it may begin with "#".)
        (cond (fnumber
  	     (goto-char (extent-start-position fnumber))
! 	     (if (eq (char-after (point)) ?#)
  		 (forward-char 1))
  	     (setq fnumber
  		   (string-to-int
*** gdbsrc.el.orig	Sun Jun 15 12:13:41 1997
--- gdbsrc.el	Sun Jun 15 12:20:18 1997
***************
*** 464,470 ****
  	  (nuke-mode-motion-extent)
  	(goto-char (event-point ee))
  	(beginning-of-line)
! 	(while (and (not (bobp)) (eq ?  (char-syntax (following-char))))
  	  (forward-line -1))
  	(if (extent-at (point) (current-buffer) 'gdbsrc)
  	    nil
--- 464,470 ----
  	  (nuke-mode-motion-extent)
  	(goto-char (event-point ee))
  	(beginning-of-line)
! 	(while (and (not (bobp)) (eq ?  (char-syntax (char-after (point)))))
  	  (forward-line -1))
  	(if (extent-at (point) (current-buffer) 'gdbsrc)
  	    nil
8<----------------------------------------------------------------->8

-- 
Karl M. Hegbloom <karlheg@inetarena.com>
http://www.inetarena.com/~karlheg
Portland, OR  USA
Debian GNU 1.3  Linux 2.1.36 AMD K5 PR-133

