mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-29 20:35:02 +00:00
Code

More resilience within port handling.

Browse Source
This commit is contained in:
Phil Jackson 2008-03-13 14:47:10 +00:00
parent 0b1207b43c
commit 045a60fb3e
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-13 Phil Jackson <phil@shellarchive.co.uk>
* org-irc.el: New function to ensure port number is always
numeric. Reports came in of it being a string /or/ a number.
2008-03-13 Carsten Dominik <dominik@science.uva.nl>

21
org-irc.el
View File

@ -166,15 +166,17 @@ the session itself."
:link (org-make-link "irc:/" link-text)
:description (concat "irc session '" link-text "'")
:server (car (car link))
:port (or (cadr (pop link)) erc-default-port)
:port (or (string-to-number (cadr (pop link))) erc-default-port)
:nick (pop link))
t)
(error "Failed to create ('irc:/' style) ERC link")))))
(defun org-irc-get-erc-link ()
"Return an org compatible irc:/ link from an ERC buffer"
(let ((link (concat erc-session-server ":"
(number-to-string erc-session-port))))
(let* ((session-port (if (numberp erc-session-port)
(number-to-string erc-session-port)
erc-session-port))
(link (concat erc-session-server ":" session-port)))
(concat link "/"
(if (and (erc-default-target)
(erc-channel-p (erc-default-target))
@ -184,6 +186,17 @@ the session itself."
(concat (erc-default-target) "/" nick))
(erc-default-target)))))
(defun org-irc-get-current-erc-port ()
"Return the current port as a number. If there is not an
explicit port set then return the erc default."
(cond
((stringp erc-session-port)
(string-to-number erc-session-port))
((numberp erc-session-port)
erc-session-port)
(t
erc-default-port)))
(defun org-irc-visit-erc (link)
"Visit an ERC buffer based on criteria from the followed link"
(let* ((server (car (car link)))
@ -196,7 +209,7 @@ the session itself."
(and tmp-server-buf
(with-current-buffer tmp-server-buf
(and
(eq erc-session-port port)
(eq (org-irc-get-current-erc-port) port)
(string= erc-session-server server)
(setq server-buffer tmp-server-buf)))))))))
(if buffer-list