aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-dcc.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 1b54fb6a48d..28ac7d38b96 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
12015-01-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Don't downcase system diagnostics' first letters
4 * erc-dcc.el (erc-dcc-server): Ignore case while comparing diagnostics.
5
12014-11-23 Michael Albinus <michael.albinus@gmx.de> 62014-11-23 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * erc-desktop-notifications.el (erc-notifications-bus): 8 * erc-desktop-notifications.el (erc-notifications-bus):
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 9d52c3b7c09..182f1e05921 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -379,7 +379,7 @@ created subprocess, or nil."
379 (set-process-filter-multibyte process nil))))) 379 (set-process-filter-multibyte process nil)))))
380 (file-error 380 (file-error
381 (unless (and (string= "Cannot bind server socket" (nth 1 err)) 381 (unless (and (string= "Cannot bind server socket" (nth 1 err))
382 (string= "address already in use" (nth 2 err))) 382 (string= "address already in use" (downcase (nth 2 err))))
383 (signal (car err) (cdr err))) 383 (signal (car err) (cdr err)))
384 (setq port (1+ port)) 384 (setq port (1+ port))
385 (unless (< port upper) 385 (unless (< port upper)
@@ -1264,4 +1264,3 @@ other client."
1264;; Local Variables: 1264;; Local Variables:
1265;; indent-tabs-mode: nil 1265;; indent-tabs-mode: nil
1266;; End: 1266;; End:
1267