[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv4397

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-pop-to-buffer): Drop the norecord argument,
since we can't support it easily in Emacs 21.
Reported by Christophe Rhodes.

--- /project/slime/cvsroot/slime/ChangeLog	2008/08/30 15:33:28	1.1483
+++ /project/slime/cvsroot/slime/ChangeLog	2008/08/30 15:33:34	1.1484
@@ -1,3 +1,9 @@
+2008-08-30  Helmut Eller  <heller at common-lisp.net>
+
+	* slime.el (slime-pop-to-buffer): Drop the norecord argument,
+	since we can't support it easily in Emacs 21.
+	Reported by Christophe Rhodes.
+
 2008-08-30  Michael Weber  <michaelw+slime at foldr.org>
 
 	* swank-gray.lisp (make-input-stream): fixed typos
--- /project/slime/cvsroot/slime/slime.el	2008/08/27 17:53:22	1.1006
+++ /project/slime/cvsroot/slime/slime.el	2008/08/30 15:33:34	1.1007
@@ -9648,15 +9648,18 @@
                                 ;; Emacs 21 uses microsecs; Emacs 22 millisecs
                                 (if timeout (truncate (* timeout 1000000)))))))
 
-(defun slime-pop-to-buffer (buffer &optional other-window norecord)
+(defun slime-pop-to-buffer (buffer &optional other-window)
   "Select buffer BUFFER in some window.
 This is like `pop-to-buffer' but also sets the input focus
 for (somewhat) better multiframe support."
   (set-buffer buffer)
-  (let ((window (display-buffer buffer other-window)))
-    (select-window window norecord)
+  (let ((old-frame (selected-frame))
+        (window (display-buffer buffer other-window)))
+    (select-window window)
     ;; select-window doesn't set the input focus
-    (when (and (not (featurep 'xemacs)) (>= emacs-major-version 22))
+    (when (and (not (featurep 'xemacs))
+               (>= emacs-major-version 22)
+               (not (eq old-frame (selected-frame))))
       (select-frame-set-input-focus (window-frame window))))
   buffer)