mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-11 02:10:35 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/net/rcirc.el (rcirc-prompt-for-encryption): New function.

Browse source 
(rcirc): Use it to prompt for encryption.
This commit is contained in:
Deniz Dogan 2011-06-05 21:03:28 +02:00
parent 34699b85fd
commit ac09b8a128
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-06-05 Deniz Dogan <deniz@dogan.se>
* net/rcirc.el (rcirc-prompt-for-encryption): New function.
(rcirc): Use it to prompt for encryption.
2011-06-05 Roland Winkler <winkler@gnu.org>
* textmodes/bibtex.el (bibtex-search-buffer): New variable.

21
lisp/net/rcirc.el
View file

@ -455,15 +455,7 @@ If ARG is non-nil, instead prompt for connection parameters."
: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 @@ If ARG is non-nil, instead prompt for connection parameters."
(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