[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Fix stringp error when trying to connect
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Fix stringp error when trying to connect to a server |
Date: |
Sun, 14 Oct 2007 00:48:31 -0400 |
commit dd1437674a380be4c34d15177fa754a00fc7ede7
Author: Michael Olson <address@hidden>
Date: Thu Nov 9 00:02:44 2006 +0000
Fix stringp error when trying to connect to a server
2006-11-08 Michael Olson <address@hidden>
* erc.el (erc-string-to-port): Avoid error when a numerical port
is passed. Thanks to Zekeriya KOÃ for the report.
git-archimport-id: address@hidden/erc--main--0--patch-58
diff --git a/ChangeLog b/ChangeLog
index e0e700a..b79043d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08 Michael Olson <address@hidden>
+
+ * erc.el (erc-string-to-port): Avoid error when a numerical port
+ is passed. Thanks to Zekeriya KOÃ for the report.
+
2006-10-21 Michael Olson <address@hidden>
* erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without
diff --git a/erc.el b/erc.el
index 38dc628..64438fe 100644
--- a/erc.el
+++ b/erc.el
@@ -5877,10 +5877,12 @@ P may be an integer or a service name."
(defun erc-string-to-port (s)
"Convert string S to either an integer port number or a service name."
- (let ((n (string-to-number s)))
- (if (= n 0)
- s
- n)))
+ (if (numberp s)
+ s
+ (let ((n (string-to-number s)))
+ (if (= n 0)
+ s
+ n))))
(defun erc-version (&optional here)
"Show the version number of ERC in the minibuffer.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Fix stringp error when trying to connect to a server,
mwolson <=