[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][master] C-u C-c C-j prompts for channel key.
From: |
mwolson |
Subject: |
[Erc-commit] [commit][master] C-u C-c C-j prompts for channel key. |
Date: |
Fri, 12 Oct 2007 11:40:10 -0400 |
commit ea0904af187c052913068e4ace41f6c75911f6bc
Author: Diane Murray <address@hidden>
Date: Fri Oct 12 17:32:58 2007 +0200
C-u C-c C-j prompts for channel key.
* erc.el (erc-join-channel): Prompt for channel key if C-u or
another prefix-arg was typed.
* NEWS: Noted this change.
diff --git a/ChangeLog b/ChangeLog
index 285c045..c8a7c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-12 Diane Murray <address@hidden>
+
+ * erc.el (erc-join-channel): Prompt for channel key if C-u or
+ another prefix-arg was typed.
+
+ * NEWS: Noted this change.
+
2007-10-07 Michael Olson <address@hidden>
* erc.el (erc-cmd-ME'S): New command that handles the case where
diff --git a/NEWS b/NEWS
index 483c8b3..991bfe1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ It requires the tls.el library.
** The function `erc-ssl' will now always use ssl.el, even in the version
of ERC that comes with Emacs.
+** Type `C-u' before `C-c C-j' to prompt for a channel key
+`erc-join-channel' now accepts a prefix-argument to prompt for the key
+when channels are protected by keywords.
+
** Changes and additions to modules
*** Channel tracking (erc-track.el)
diff --git a/erc.el b/erc.el
index 6957e3d..18efee6 100644
--- a/erc.el
+++ b/erc.el
@@ -3676,7 +3676,7 @@ If `point' is at the beginning of a channel name, use
that as default."
(set-buffer (process-buffer erc-server-process))
erc-channel-list)))
(completing-read "Join channel: " table nil nil nil nil chnl))
- (when erc-prompt-for-channel-key
+ (when (or current-prefix-arg erc-prompt-for-channel-key)
(read-from-minibuffer "Channel key (RET for none): " nil))))
(erc-cmd-JOIN channel (when (>= (length key) 1) key)))
- [Erc-commit] [commit][master] C-u C-c C-j prompts for channel key.,
mwolson <=