[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104501: * lisp/net/rcirc.el (rcirc-p
From: |
Deniz Dogan |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104501: * lisp/net/rcirc.el (rcirc-prompt-for-encryption): New function. |
Date: |
Sun, 05 Jun 2011 21:03:28 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104501
committer: Deniz Dogan <address@hidden>
branch nick: emacs-trunk
timestamp: Sun 2011-06-05 21:03:28 +0200
message:
* lisp/net/rcirc.el (rcirc-prompt-for-encryption): New function.
(rcirc): Use it to prompt for encryption.
modified:
lisp/ChangeLog
lisp/net/rcirc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-05 05:46:43 +0000
+++ b/lisp/ChangeLog 2011-06-05 19:03:28 +0000
@@ -1,3 +1,8 @@
+2011-06-05 Deniz Dogan <address@hidden>
+
+ * net/rcirc.el (rcirc-prompt-for-encryption): New function.
+ (rcirc): Use it to prompt for encryption.
+
2011-06-05 Roland Winkler <address@hidden>
* textmodes/bibtex.el (bibtex-search-buffer): New variable.
=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-06-01 08:10:42 +0000
+++ b/lisp/net/rcirc.el 2011-06-05 19:03:28 +0000
@@ -455,15 +455,7 @@
:channels)
" "))
"[, ]+" t))
- (encryption
- (intern (completing-read "Encryption (default plain): "
- '("plain" "tls")
- nil t
- (let ((choice (plist-get server-plist
- :encryption)))
- (when choice
- (symbol-name choice)))
- nil "plain"))))
+ (encryption (rcirc-prompt-for-encryption server-plist)))
(rcirc-connect server port nick user-name
rcirc-default-full-name
channels password encryption))
@@ -596,6 +588,17 @@
(time-to-seconds (current-time))
(float-time)))
+(defun rcirc-prompt-for-encryption (server-plist)
+ "Prompt the user for the encryption method to use.
+SERVER-PLIST is the property list for the server."
+ (let ((msg "Encryption (default %s): ")
+ (choices '("plain" "tls"))
+ (default (or (plist-get server-plist :encryption)
+ "plain")))
+ (intern
+ (completing-read (format msg default)
+ choices nil t "" nil default))))
+
(defun rcirc-keepalive ()
"Send keep alive pings to active rcirc processes.
Kill processes that have not received a server message since the
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104501: * lisp/net/rcirc.el (rcirc-prompt-for-encryption): New function.,
Deniz Dogan <=