[Idle-dev] CVS: idle ParenMatch.py,1.2,1.3

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv23163

Modified Files:
	ParenMatch.py 
Log Message:
cvs-py-rel2_1 (Rev 1.5) merge - whitespace normalization


Index: ParenMatch.py
===================================================================
RCS file: /cvsroot/idlefork/idle/ParenMatch.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ParenMatch.py	2001/07/04 03:15:10	1.2
--- ParenMatch.py	2001/07/13 19:49:27	1.3
***************
*** 21,25 ****
  
      There are three supported style of paren matching, based loosely
!     on the Emacs options.  The style is select based on the 
      HILITE_STYLE attribute; it can be changed used the set_style
      method.
--- 21,25 ----
  
      There are three supported style of paren matching, based loosely
!     on the Emacs options.  The style is select based on the
      HILITE_STYLE attribute; it can be changed used the set_style
      method.
***************
*** 44,50 ****
      so I haven't bothered.
      """
!     
      menudefs = []
!     
      keydefs = {
          '<<flash-open-paren>>' : ('<KeyRelease-parenright>',
--- 44,50 ----
      so I haven't bothered.
      """
! 
      menudefs = []
! 
      keydefs = {
          '<<flash-open-paren>>' : ('<KeyRelease-parenright>',
***************
*** 147,151 ****
      tabwidth = AutoIndent.tabwidth
      context_use_ps1 = AutoIndent.context_use_ps1
!     
      def __init__(self, editwin):
          self.editwin = editwin
--- 147,151 ----
      tabwidth = AutoIndent.tabwidth
      context_use_ps1 = AutoIndent.context_use_ps1
! 
      def __init__(self, editwin):
          self.editwin = editwin
***************
*** 159,163 ****
              # rawtext needs to contain everything up to the last
              # character, which was the close paren.  the parser also
! 	    # requires that the last line ends with "\n"
              rawtext = self.text.get(startatindex, "insert")[:-1] + "\n"
              y.set_str(rawtext)
--- 159,163 ----
              # rawtext needs to contain everything up to the last
              # character, which was the close paren.  the parser also
!             # requires that the last line ends with "\n"
              rawtext = self.text.get(startatindex, "insert")[:-1] + "\n"
              y.set_str(rawtext)
***************
*** 176,180 ****
          i, buf = self._find_offset_in_buf(lno)
          if i is None \
! 	   or keysym_type(buf[i]) != right_keysym_type:
              return None
          lines_back = string.count(buf[i:], "\n") - 1
--- 176,180 ----
          i, buf = self._find_offset_in_buf(lno)
          if i is None \
!            or keysym_type(buf[i]) != right_keysym_type:
              return None
          lines_back = string.count(buf[i:], "\n") - 1
***************
*** 190,192 ****
              return icis(startindex + "%dc" % offset)
          return inner
- 
--- 190,191 ----