[Python-checkins] python/dist/src/Misc python-mode.el,4.34,4.35

[klm@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Misc
In directory sc8-pr-cvs1:/tmp/cvs-serv30394

Modified Files:
	python-mode.el 
Log Message:
Remove short-circuitying grubbing by using last grubbed buffer.  It's
evil - if the last grubbed buffer didn't happen to be the right one,
you couldn't remedy.

Mainline emacs compat - don't use third arg to buffer-substring (which
was for explicitly identifying the buffer in which to seek the
substring, and which turns out to be unnecessary).


Index: python-mode.el
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/python-mode.el,v
retrieving revision 4.34
retrieving revision 4.35
diff -C2 -d -r4.34 -r4.35
*** python-mode.el	1 May 2003 21:07:32 -0000	4.34
--- python-mode.el	17 Jun 2003 19:18:57 -0000	4.35
***************
*** 1371,1376 ****
                                    (string-match "^\\([^#]\\|#[^#]\\|#$\\)"
                                                  (buffer-substring (point-min)
!                                                                   (point-max)
!                                                                   funcbuffer))
                                    ))))))
               (list lineno funcbuffer))
--- 1371,1375 ----
                                    (string-match "^\\([^#]\\|#[^#]\\|#$\\)"
                                                  (buffer-substring (point-min)
!                                                                   (point-max)))
                                    ))))))
               (list lineno funcbuffer))
***************
*** 1393,1400 ****
          curbuf
          got)
-     (if (and py-pdbtrack-last-grubbed-buffer
-              (member py-pdbtrack-last-grubbed-buffer buffers))
-         ; Prefer last grubbed buffer by putting it at the front of the list:
-         (setq buffers (cons py-pdbtrack-last-grubbed-buffer buffers)))
      (while (and buffers (not got))
        (setq buf (car buffers)
--- 1392,1395 ----
***************
*** 1405,1411 ****
                     (string-match (concat "^\\s-*\\(def\\|class\\)\\s-+"
                                           funcname "\\s-*(")
!                                  (buffer-substring (point-min buf)
!                                                    (point-max buf)
!                                                    buf))))
            (setq got buf)))
      (setq py-pdbtrack-last-grubbed-buffer got)))
--- 1400,1407 ----
                     (string-match (concat "^\\s-*\\(def\\|class\\)\\s-+"
                                           funcname "\\s-*(")
!                                  (save-excursion
!                                    (set-buffer buf)
!                                    (buffer-substring (point-min)
!                                                      (point-max))))))
            (setq got buf)))
      (setq py-pdbtrack-last-grubbed-buffer got)))