diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-01-03 18:27:21 +0100 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-01-03 18:27:21 +0100 |
| commit | e66ba1dfc4cf2e12100191d2c24436c42d097268 (patch) | |
| tree | b50b009e703fe1a9e8cb13cddf7928a97ad6210c /lisp/org/org-irc.el | |
| parent | 88c5c7c8313162b94173fd4333e6062aa07c4d2e (diff) | |
| download | emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.tar.gz | |
Merge Org 7.8.03
Diffstat (limited to 'lisp/org/org-irc.el')
| -rw-r--r-- | lisp/org/org-irc.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el index 7a84d2053ad..c4ad32146d7 100644 --- a/lisp/org/org-irc.el +++ b/lisp/org/org-irc.el @@ -4,7 +4,6 @@ ;; ;; Author: Philip Jackson <emacs@shellarchive.co.uk> ;; Keywords: erc, irc, link, org -;; Version: 7.7 ;; ;; This file is part of GNU Emacs. ;; @@ -60,6 +59,8 @@ (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.") @@ -232,7 +233,7 @@ default." (throw 'found x)))))) (if chan-buf (progn - (switch-to-buffer chan-buf) + (org-pop-to-buffer-same-window chan-buf) ;; if we got a nick, and they're in the chan, ;; then start a chat with them (let ((nick (pop link))) @@ -243,14 +244,12 @@ default." (insert (concat nick ": "))) (error "%s not found in %s" nick chan-name))))) (progn - (switch-to-buffer server-buffer) + (org-pop-to-buffer-same-window server-buffer) (erc-cmd-JOIN chan-name)))) - (switch-to-buffer server-buffer))) + (org-pop-to-buffer-same-window server-buffer))) ;; no server match, make new connection (erc-select :server server :port port)))) (provide 'org-irc) - - ;;; org-irc.el ends here |