From 8e3156b637f064d6ff8a5d380880d12aa092a85c Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Thu, 23 Feb 2012 16:28:23 -0500
Subject: [PATCH] unbury-buffer: new command

minibuffer.prototype.read_buffer now accepts a $buffers keyword, allowing
the caller to give the buffers to complete from and their order.
---
 modules/buffer.js | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/modules/buffer.js b/modules/buffer.js
index 3e0000a..ec6dec4 100644
--- a/modules/buffer.js
+++ b/modules/buffer.js
@@ -577,6 +577,20 @@ buffer_container.prototype = {
         return true;
     },
 
+    unbury_buffer: function (b) {
+        var c = this.current;
+        if (bury_buffer_position != null) {
+            this.buffer_list.splice(this.buffer_list.indexOf(b), 1);
+            this.buffer_list.splice(this.buffer_list.indexOf(c), 0, b);
+        }
+        this.buffer_history.splice(this.buffer_history.indexOf(b), 1);
+        this.buffer_history.unshift(b);
+        this.current = b;
+        if (bury_buffer_position != null)
+            move_buffer_hook.run(b);
+        return true;
+    },
+
     for_each: function (f) {
         var count = this.count;
         for (var i = 0; i < count; ++i)
@@ -714,15 +728,15 @@ define_variable("read_buffer_show_icons", false,
     "library.");
 
 minibuffer_auto_complete_preferences["buffer"] = true;
-define_keywords("$default");
+define_keywords("$buffers", "$default");
 minibuffer.prototype.read_buffer = function () {
     var window = this.window;
-    var buffer = this.window.buffers.current;
     keywords(arguments, $prompt = "Buffer:",
-             $default = buffer,
+             $buffers = function (visitor) window.buffers.for_each(visitor),
+             $default = window.buffers.current,
              $history = "buffer");
     var completer = all_word_completer(
-        $completions = function (visitor) window.buffers.for_each(visitor),
+        $completions = arguments.$buffers,
         $get_string = function (x) x.description,
         $get_description = function (x) x.title,
         $get_icon = (read_buffer_show_icons ?
@@ -867,6 +881,23 @@ interactive("bury-buffer",
     "selected by `switch-to-buffer'.",
     function (I) { I.window.buffers.bury_buffer(I.buffer); });
 
+interactive("unbury-buffer",
+    "Unbury a buffer.\nPrompt for a buffer in reverse access-order, "+
+    "and switch to it.  When `bury_buffer_position` is non-null, move "+
+    "the buffer to the current position in the buffer list.",
+    function (I) {
+        var buffers = I.window.buffers;
+        buffers.unbury_buffer(
+            (yield I.minibuffer.read_buffer(
+                $prompt = "Switch to buffer:",
+                $buffers = function (visitor) {
+                    var count = buffers.count;
+                    for (var i = count - 1; i >= 0; --i)
+                        visitor(buffers.buffer_history[i]);
+                },
+                $default = buffers.buffer_history[buffers.count - 1])));
+    });
+
 function change_directory (buffer, dir) {
     if (buffer.page != null)
         delete buffer.page.local.cwd;
-- 
2.11.4.GIT