[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116552: erc-network: fix erc-determine-network when
From: |
Julien Danjou |
Subject: |
[Emacs-diffs] trunk r116552: erc-network: fix erc-determine-network when no network |
Date: |
Tue, 25 Feb 2014 17:37:53 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116552
revision-id: address@hidden
parent: address@hidden
committer: Julien Danjou <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-25 18:37:25 +0100
message:
erc-network: fix erc-determine-network when no network
* erc-networks.el (erc-determine-network): Check that NETWORK as a
value, some servers set it to nothing.
modified:
lisp/erc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-4305
lisp/erc/erc-networks.el
ercnetworks.el-20091113204419-o5vbwnq5f7feedwu-4365
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2014-01-31 06:39:51 +0000
+++ b/lisp/erc/ChangeLog 2014-02-25 17:37:25 +0000
@@ -1,3 +1,8 @@
+2014-02-25 Julien Danjou <address@hidden>
+
+ * erc-networks.el (erc-determine-network): Check that NETWORK as a
+ value, some servers set it to nothing.
+
2014-01-31 Glenn Morris <address@hidden>
* erc.el (erc-accidental-paste-threshold-seconds): Doc tweak.
=== modified file 'lisp/erc/erc-networks.el'
--- a/lisp/erc/erc-networks.el 2014-02-10 01:34:22 +0000
+++ b/lisp/erc/erc-networks.el 2014-02-25 17:37:25 +0000
@@ -724,16 +724,17 @@
server parameter NETWORK if provided, otherwise parse the server name and
search for a match in `erc-networks-alist'."
;; The server made it easy for us and told us the name of the NETWORK
- (if (assoc "NETWORK" erc-server-parameters)
- (intern (cdr (assoc "NETWORK" erc-server-parameters)))
- (or
- ;; Loop through `erc-networks-alist' looking for a match.
- (let ((server (or erc-server-announced-name erc-session-server)))
- (cl-loop for (name matcher) in erc-networks-alist
- when (and matcher
- (string-match (concat matcher "\\'") server))
- do (cl-return name)))
- 'Unknown)))
+ (let ((network-name (cdr (assoc "NETWORK" erc-server-parameters))))
+ (if network-name
+ (intern network-name)
+ (or
+ ;; Loop through `erc-networks-alist' looking for a match.
+ (let ((server (or erc-server-announced-name erc-session-server)))
+ (cl-loop for (name matcher) in erc-networks-alist
+ when (and matcher
+ (string-match (concat matcher "\\'") server))
+ do (cl-return name)))
+ 'Unknown))))
(defun erc-network ()
"Return the value of `erc-network' for the current server."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116552: erc-network: fix erc-determine-network when no network,
Julien Danjou <=