Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ac09b8a1
Commit
ac09b8a1
authored
Jun 05, 2011
by
Deniz Dogan
Browse files
* lisp/net/rcirc.el (rcirc-prompt-for-encryption): New function.
(rcirc): Use it to prompt for encryption.
parent
34699b85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
9 deletions
+17
-9
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/net/rcirc.el
lisp/net/rcirc.el
+12
-9
No files found.
lisp/ChangeLog
View file @
ac09b8a1
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.
...
...
lisp/net/rcirc.el
View file @
ac09b8a1
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment