[Erc-help] [C] erc: Upstream sync resulting from recent XEmacs erc sync

[Adrian A. <ad...@xe...>]

COMMIT

I trust this is not-controversial so I have commit it.

Let me know if you have issues with any of these changes.

Best regards,

Adrian

ChangeLog addition:

2005-04-17  Adrian Aichner  <ad...@xe...>

	* erc-log.el: Remove stray whitespace.
	* erc.el: Ditto.

2005-04-09  Aidan Kehoe  <ke...@pa...>

	* erc.el: autoload erc-select-read-args, which, because it parses
	erc-select's args, can be called before erc.el is loaded. 


erc source patch:
Diff command:   cvs -f -z3 -q diff -u -N
Files affected: erc.el erc-log.el

Index: erc-log.el
===================================================================
RCS file: /cvsroot/erc/erc/erc-log.el,v
retrieving revision 1.23
diff -u -r1.23 erc-log.el
--- erc-log.el	1 Mar 2005 05:54:52 -0000	1.23
+++ erc-log.el	17 Apr 2005 10:37:55 -0000
@@ -279,7 +279,7 @@
 		      (erc-current-nick)
 		      erc-session-server erc-session-port))
    erc-log-channels-directory))
-	     
+
 (defun erc-generate-log-file-name-with-date (buffer &rest ignore)
   "This function computes a short log file name.
 The name of the log file is composed of BUFFER and the current date.
Index: erc.el
===================================================================
RCS file: /cvsroot/erc/erc/erc.el,v
retrieving revision 1.751
diff -u -r1.751 erc.el
--- erc.el	5 Apr 2005 01:08:18 -0000	1.751
+++ erc.el	17 Apr 2005 10:37:58 -0000
@@ -2082,6 +2082,7 @@
   :group 'erc-hooks
   :type 'hook)
 
+;;;###autoload
 (defun erc-select-read-args ()
   "Prompt the user for values of nick, server, port, and password."
   (let (user-input server port nick passwd)
@@ -5409,7 +5410,7 @@
 	
 	;; Only when last hook has been run...
 	(run-hook-with-args 'erc-send-completed-hook str))))))
-  
+
 (defun erc-user-input ()
   "Return the input of the user in the current buffer."
   ;; We use erc-bol to ignore the prompt.

-- 
Adrian Aichner
 mailto:ad...@xe...
 http://www.xemacs.org/