[Idle-dev] CVS: idle PyShell.py,1.23,1.24

[Kurt B. Kaiser]

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

Modified Files:
	PyShell.py 
Log Message:
MERGE DS_RPC_BRANCH into MAIN
PyShell.py
    don't track Py Idle patch 543222 - disable script bindings in shell
    since it was done differently in MAIN

    Remove "binding comments" 05 Aug 1.13.2.2 to 1.13.2.3


Index: PyShell.py
===================================================================
RCS file: /cvsroot/idlefork/idle/PyShell.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** PyShell.py	5 Sep 2002 02:31:20 -0000	1.23
--- PyShell.py	14 Sep 2002 02:50:56 -0000	1.24
***************
*** 56,93 ****
  linecache.checkcache = linecache_checkcache
  
- 
- # Note: <<newline-and-indent>> event is defined in AutoIndent.py
- 
- #$ event <<plain-newline-and-indent>>
- #$ win <Control-j>
- #$ unix <Control-j>
- 
- #$ event <<beginning-of-line>>
- #$ win <Control-a>
- #$ win <Home>
- #$ unix <Control-a>
- #$ unix <Home>
- 
- #$ event <<history-next>>
- #$ win <Alt-n>
- #$ unix <Alt-n>
- 
- #$ event <<history-previous>>
- #$ win <Alt-p>
- #$ unix <Alt-p>
- 
- #$ event <<interrupt-execution>>
- #$ win <Control-c>
- #$ unix <Control-c>
- 
- #$ event <<end-of-file>>
- #$ win <Control-d>
- #$ unix <Control-d>
- 
- #$ event <<open-stack-viewer>>
- 
- #$ event <<toggle-debugger>>
- 
- 
  class PyShellEditorWindow(EditorWindow):
      "Regular text edit window when a shell is present"
--- 56,59 ----
***************
*** 497,502 ****
          __builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D."
  
!         self.auto = self.extensions["AutoIndent"] # Required extension
!         self.auto.config(usetabs=1, indentwidth=8, context_use_ps1=1)
  
          text = self.text
--- 463,467 ----
          __builtin__.quit = __builtin__.exit = "To exit, type Ctrl-D."
  
!         self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
  
          text = self.text
***************
*** 628,632 ****
          self.interp = None
          self.console = None
-         self.auto = None
          self.flist.pyshell = None
          self.history = None
--- 593,596 ----
***************
*** 737,741 ****
              self.text.see("insert")
          else:
!             self.auto.auto_indent(event)
          return "break"
  
--- 701,705 ----
              self.text.see("insert")
          else:
!             self.auto_indent(event)
          return "break"
  
***************
*** 777,781 ****
          # insert a newline right at the insert point
          if self.text.compare("insert", "<", "end-1c linestart"):
!             self.auto.auto_indent(event)
              return "break"
          # We're in the last line; append a newline and submit it
--- 741,745 ----
          # insert a newline right at the insert point
          if self.text.compare("insert", "<", "end-1c linestart"):
!             self.auto_indent(event)
              return "break"
          # We're in the last line; append a newline and submit it
***************
*** 785,789 ****
              self.text.see("insert")
          else:
!             self.auto.auto_indent(event)
          self.text.tag_add("stdin", "iomark", "end-1c")
          self.text.update_idletasks()
--- 749,753 ----
              self.text.see("insert")
          else:
!             self.auto_indent(event)
          self.text.tag_add("stdin", "iomark", "end-1c")
          self.text.update_idletasks()