7 files changed, 52 insertions, 5 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2e6ae072c8b..d9f9f0722f1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-29  Michael Olson  <mwolson@gnu.org>
+
+	* ERC-NEWS: Update for recent change.
+
 2007-10-27  Juanma Barranquero  <lekktu@gmail.com>
 
 	* .cvsignore: Add *.pyc.
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 53b595a753f..2d2e0d8164c 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-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/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 09882be34b8..da03b833f51 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc-ibuffer.el (erc-modified-channels-alist): Use
+	eval-when-compile, and explain why we are doing this..
+
+	* erc-track.el: Make sure that the state of erc-track-minor-mode
+	is not preserved when using desktop.el.  Thanks to Levin for the
+	report.
+
 2007-10-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* erc-ibuffer.el (erc-modified-channels-alist): Pacify
@@ -8,7 +17,27 @@
 	* erc-track.el (erc-modified-channels-update): Use mapc rather
 	than mapcar.
 
-2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>  (tiny change)
+2007-10-12  Diane Murray  <disumu@x3y2z1.net>
+
+	* 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  <mwolson@gnu.org>
+
+	* erc.el (erc-cmd-ME'S): New command that handles the case where
+	someone types "/me's".  It concatenates the text " 's" to the
+	beginning of the input and then sends the result like a normal
+	"/me" command.
+	(erc-command-regexp): Permit single-quote character.
+
+2007-09-30  Aidan Kehoe  <kehoea@parhasard.net>  (tiny change)
+
+	* erc-log.el (erc-save-buffer-in-logs): Prevent spurious warnings
+	when looking at a log file and concurrently saving to it.
+
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gnu.org>  (tiny change)
 
 	* erc.texi (Special-Features): Fix small typo.
 
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index e4de3c1fe50..76c2d2b18b1 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -71,7 +71,9 @@
 	 (string-match qualifier (or erc-server-announced-name
 				     erc-session-server)))))
 
-(defvar erc-modified-channels-alist)
+;; Silence the byte-compiler
+(eval-when-compile
+  (defvar erc-modified-channels-alist))
 
 (define-ibuffer-column erc-modified (:name "M")
   (if (and (boundp 'erc-track-mode)
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 1733b3d1b00..7ea3c63b4b2 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -415,7 +415,8 @@ You can save every individual message by putting this function on
   (or buffer (setq buffer (current-buffer)))
   (when (erc-logging-enabled buffer)
     (let ((file (erc-current-logfile buffer))
-	  (coding-system erc-log-file-coding-system))
+	  (coding-system erc-log-file-coding-system)
+	  (inhibit-clash-detection t))	; needed for XEmacs
       (save-excursion
 	(with-current-buffer buffer
 	  (save-restriction
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index ad3eaf73a4b..61d56c94ca7 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -560,6 +560,8 @@ module, otherwise the keybindings will not do anything useful."
   :global t
   :group 'erc-track)
 
+(add-to-list 'desktop-minor-mode-table '(erc-track-minor-mode nil))
+
 (defun erc-track-minor-mode-maybe ()
   "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'."
   (unless (or erc-track-minor-mode
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 2c5786adff3..7b27f278bed 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3014,6 +3014,11 @@ LINE has the format \"USER ACTION\"."
    (t nil)))
 (put 'erc-cmd-ME 'do-not-parse-args t)
 
+(defun erc-cmd-ME\'S (line)
+  "Do a /ME command, but add the string \" 's\" to the beginning."
+  (erc-cmd-ME (concat " 's" line)))
+(put 'erc-cmd-ME\'S 'do-not-parse-args t)
+
 (defun erc-cmd-LASTLOG (line)
   "Show all lines in the current buffer matching the regexp LINE.
 
@@ -3669,7 +3674,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)))
 
@@ -5033,7 +5038,7 @@ Specifically, return the position of `erc-insert-marker'."
    erc-input-marker
    (erc-end-of-input-line)))
 
-(defvar erc-command-regexp "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$"
+(defvar erc-command-regexp "^/\\([A-Za-z']+\\)\\(\\s-+.*\\|\\s-*\\)$"
   "Regular expression used for matching commands in ERC.")
 
 (defun erc-send-input (input)