[Emacs-diffs] Changes to emacs/lisp/erc/erc-speedbar.el

[Miles Bader]

Index: emacs/lisp/erc/erc-speedbar.el
diff -u emacs/lisp/erc/erc-speedbar.el:1.1 emacs/lisp/erc/erc-speedbar.el:1.2
--- emacs/lisp/erc/erc-speedbar.el:1.1  Sun Jan 29 13:08:57 2006
+++ emacs/lisp/erc/erc-speedbar.el      Mon Jan 30 00:29:49 2006
@@ -39,6 +39,7 @@
 (require 'erc)
 (require 'speedbar)
 (condition-case nil (require 'dframe) (error nil))
+(eval-when-compile (require 'cl))
 
 ;;; Customization:
 
@@ -110,7 +111,7 @@
 (defun erc-speedbar-buttons (buffer)
   "Create buttons for speedbar in BUFFER."
   (erase-buffer)
-  (let (serverp chanp)
+  (let (serverp chanp queryp)
     (with-current-buffer buffer
       (setq serverp (eq buffer (process-buffer erc-server-process)))
       (setq chanp (erc-channel-p (erc-default-target)))
@@ -338,7 +339,7 @@
            (raise-frame (window-frame bwin)))
        (if speedbar-power-click
            (let ((pop-up-frames t)) (select-window (display-buffer buffer)))
-         (select-frame speedbar-attached-frame)
+         (dframe-select-attached-frame speedbar-frame)
          (switch-to-buffer buffer))))))
 
 (defun erc-speedbar-line-text ()