HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
erc
/
erc-networks.el
diff --git
a/lisp/erc/erc-networks.el
b/lisp/erc/erc-networks.el
index
6cb8192
..
177f371
100644
(file)
--- a/
lisp/erc/erc-networks.el
+++ b/
lisp/erc/erc-networks.el
@@
-1,8
+1,9
@@
;;; erc-networks.el --- IRC networks
;;; erc-networks.el --- IRC networks
-;; Copyright (C) 2002, 2004
, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004
-2013
Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@lexx.delysid.org>
;; Author: Mario Lang <mlang@lexx.delysid.org>
+;; Maintainer: FSF
;; Keywords: comm
;; This file is part of GNU Emacs.
;; Keywords: comm
;; This file is part of GNU Emacs.
@@
-39,7
+40,7
@@
;;; Code:
(require 'erc)
;;; Code:
(require 'erc)
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl
-lib
))
;; Variables
;; Variables
@@
-728,10
+729,10
@@
search for a match in `erc-networks-alist'."
(or
;; Loop through `erc-networks-alist' looking for a match.
(let ((server (or erc-server-announced-name erc-session-server)))
(or
;; Loop through `erc-networks-alist' looking for a match.
(let ((server (or erc-server-announced-name erc-session-server)))
- (loop for (name matcher) in erc-networks-alist
- when (and matcher
- (string-match (concat matcher "\\'") server))
-
do (
return name)))
+ (
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 ()
'Unknown)))
(defun erc-network ()
@@
-788,8
+789,8
@@
As an example:
(cond ((numberp p)
(push p result))
((listp p)
(cond ((numberp p)
(push p result))
((listp p)
- (setq result (nconc (loop for i from (cadr p) downto (car p)
- collect i)
+ (setq result (nconc (
cl-
loop for i from (cadr p) downto (car p)
+
collect i)
result)))))
(nreverse result)))
result)))))
(nreverse result)))