From 381d2a049ac59eb0a20d5818ffd080fc3ae767e3 Mon Sep 17 00:00:00 2001
From: tailor <sabetts@vcn.bc.ca>
Date: Sun, 14 Jan 2007 12:12:21 +0000
Subject: [PATCH] [lice @ fix minibuffer errors]

---
 minibuffer.lisp | 4 ++--
 wm.lisp         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/minibuffer.lisp b/minibuffer.lisp
index f701a20..2c5edfb 100644
--- a/minibuffer.lisp
+++ b/minibuffer.lisp
@@ -179,13 +179,13 @@ MINIBUF must be a minibuffer."
 			  (and (consp hist-val)
 			       (not (equal hist-string (car hist-val)))))
 		  (push hist-string hist-val)
-		  (setf *minibuffer-history-variable* hist-val))
+		  (setf (symbol-value *minibuffer-history-variable*) hist-val))
 		;; truncate if requested
 		(let ((len (or (get *minibuffer-history-variable* :history-length)
 			       *history-length*)))
 		  (when (integerp len)
 		    (if (< len 0)
-			(setf *minibuffer-history-variable* nil)
+			(setf (symbol-value *minibuffer-history-variable*) nil)
 		      (let ((tmp (nthcdr len hist-val)))
 			(when tmp
 			  (rplacd tmp nil))))))))
diff --git a/wm.lisp b/wm.lisp
index 5ce6dc2..794c664 100644
--- a/wm.lisp
+++ b/wm.lisp
@@ -66,7 +66,8 @@
 					  (restore-tree (second tree)))))))
       (setf (frame-window-tree frame) (cons (restore-tree (frame-bk-window-tree configuration))
 					    (cdr (frame-window-tree frame)))
-	    (frame-current-window frame) cw))))
+	    (frame-current-window frame) cw)
+      (set-buffer (window-buffer cw)))))
 
 (defmacro save-window-excursion (&body body)
   "Execute body, preserving window sizes and contents.
-- 
2.11.4.GIT