Merge branch 'buffer-rolling' into next

diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
index 7fa82d88bfdbd0a861a5e35bbe24aea8345a3348..12dd11949b90797753e8fefc4037ffad52f5a95f 100644 (file)
--- a/lib/sup/buffer.rb
+++ b/lib/sup/buffer.rb
@@ -235,14 +235,20 @@ EOS
   ## have to change this. but it's not clear that we will ever actually
   ## do that.
   def roll_buffers
-    @buffers.last.force_to_top = false
-    raise_to_front @buffers.first
+    bufs = rollable_buffers
+    bufs.last.force_to_top = false
+    raise_to_front bufs.first
   end
 
   def roll_buffers_backwards
-    return unless @buffers.length > 1
-    @buffers.last.force_to_top = false
-    raise_to_front @buffers[@buffers.length - 2]
+    bufs = rollable_buffers
+    return unless bufs.length > 1
+    bufs.last.force_to_top = false
+    raise_to_front bufs[bufs.length - 2]
+  end
+
+  def rollable_buffers
+    @buffers.select { |b| !b.system? || @buffers.last == b }
   end
 
   def handle_input c