--HG--

branch : pmacs2

application.py

@@ -161,16 +161,15 @@ class Application(object):
         self.loadrc()
 
         # initialize our buffers
-        # note that the first buffer in buffers will be initially visible
+        # note that only the first buffer will be initially visible
         buffers.append(buffer.about.AboutBuffer())
-        buffers.append(buffer.console.ConsoleBuffer())
+        #buffers.append(buffer.console.ConsoleBuffer())
-        
         if self.rcerror:
             buffers.insert(0, buffer.data.DataBuffer('*RcError*', self.rcerror))
 
         # build windows for our buffers
         for b in buffers:
-            if b.name() == '*Console*':
+            if b.modename:
                 window.Window(b, self)
             else:
                 window.Window(b, self, mode_name=init_mode)

buffer/__init__.py

@@ -43,10 +43,11 @@ class DelMove(object):
 
 # abstract class
 class Buffer(object):
-    btype   = 'generic'
+    btype    = 'generic'
-    mac_re  = re.compile('\r(?!\n)')
+    modename = None
-    unix_re = re.compile('(?<!\r)\n')
+    mac_re   = re.compile('\r(?!\n)')
-    win_re  = re.compile('\r\n')
+    unix_re  = re.compile('(?<!\r)\n')
+    win_re   = re.compile('\r\n')
     def __init__(self, stack_limit=STACK_LIMIT):
         self.lines       = [""]
         self.windows     = []

default.py

@@ -6,7 +6,10 @@ def none(window):
 
 def last_buffer(window):
     bl = window.application.bufferlist
-    return bl.hidden_buffers[0].name()
+    if bl.hidden_buffers:
+        return bl.hidden_buffers[0].name()
+    else:
+        return ''
 
 def current_buffer(window):
     return window.buffer.name()