diff options
Diffstat (limited to 'lisp/org/org-irc.el')
| -rw-r--r-- | lisp/org/org-irc.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el index bc0e94450b..7a84d2053a 100644 --- a/lisp/org/org-irc.el +++ b/lisp/org/org-irc.el @@ -1,6 +1,6 @@ ;;; org-irc.el --- Store links to IRC sessions ;; -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson <[email protected]> ;; Keywords: erc, irc, link, org @@ -60,8 +60,6 @@ (declare-function erc-server-buffer "erc" ()) (declare-function erc-get-server-nickname-list "erc" ()) (declare-function erc-cmd-JOIN "erc" (channel &optional key)) -(declare-function org-pop-to-buffer-same-window - "org-compat" (&optional buffer-or-name norecord label)) (defvar org-irc-client 'erc "The IRC client to act on.") @@ -234,7 +232,7 @@ default." (throw 'found x)))))) (if chan-buf (progn - (org-pop-to-buffer-same-window chan-buf) + (switch-to-buffer chan-buf) ;; if we got a nick, and they're in the chan, ;; then start a chat with them (let ((nick (pop link))) @@ -245,14 +243,14 @@ default." (insert (concat nick ": "))) (error "%s not found in %s" nick chan-name))))) (progn - (org-pop-to-buffer-same-window server-buffer) + (switch-to-buffer server-buffer) (erc-cmd-JOIN chan-name)))) - (org-pop-to-buffer-same-window server-buffer))) + (switch-to-buffer server-buffer))) ;; no server match, make new connection (erc-select :server server :port port)))) (provide 'org-irc) -;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a + ;;; org-irc.el ends here |