Commits

Anonymous committed a0790c1

packages: sync upstream bugfix for erc-log-insert-log-on-open to work with autojoin

-------------------- ChangeLog entries follow: --------------------

xemacs-packages/erc/ChangeLog addition:

2005-04-25 Adrian Aichner <adrian@xemacs.org>

* sync upstream bugfix for erc-log-insert-log-on-open to work with
autojoin (Version 5.0 (CVS) Revision: 1.752).
* ChangeLog.upstream: Sync
* Makefile (AUTHOR_VERSION): Sync
* erc-backend.el (erc-backend-version): Sync
* erc-backend.el (JOIN): Bugfix
* erc-log.el (erc-log-version): Sync
* erc-spelling.el: Remove unnecessary require of 'ispell.
* erc.el (erc-version-string): Sync

Comments (0)

Files changed (5)

+2005-04-25  Adrian Aichner  <adrian@xemacs.org>
+
+	* sync upstream bugfix for erc-log-insert-log-on-open to work with
+	autojoin (Version 5.0 (CVS) Revision: 1.752).
+	* ChangeLog.upstream: Sync
+	* Makefile (AUTHOR_VERSION): Sync
+	* erc-backend.el (erc-backend-version): Sync
+	* erc-backend.el (JOIN): Bugfix
+	* erc-log.el (erc-log-version): Sync
+	* erc-spelling.el: Remove unnecessary require of 'ispell.
+	* erc.el (erc-version-string): Sync
+
 2005-04-11  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 0.14 released.

ChangeLog.upstream

+2005-04-24  Adrian Aichner  <adrian@xemacs.org>
+
+	* erc-backend.el (JOIN): save-excursion so that
+	`erc-current-logfile' inserts into the correct channel buffers
+	when using erc-log-insert-log-on-open in combination with autojoin
+	to multiple channels.
+
+2005-04-17  Adrian Aichner  <adrian@xemacs.org>
+
+	* erc-log.el: Remove stray whitespace.
+	* erc.el: Ditto.
+
+2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* erc.el: autoload erc-select-read-args, which, because it parses
+	erc-select's args, can be called before erc.el is loaded. 
+
 2005-04-07  Edward O'Connor  <ted@oconnor.cx>
 	
 	* erc-viper.el: Remove final newlines from previously-existing ERC
 
 
 VERSION = 0.14
-AUTHOR_VERSION = Version 5.0 Revision: 1.751
+AUTHOR_VERSION = Version 5.0 Revision: 1.752
 MAINTAINER = Adrian Aichner <adrian@xemacs.org>
 PACKAGE = erc
 PKG_TYPE = regular
       ;; strip the stupid combined JOIN facility (IRC 2.9)
       (if (string-match "^\\(.*\\)?\^g.*$" chnl)
           (setq chnl (match-string 1 chnl)))
-      (let* ((str (cond
-                   ;; If I have joined a channel
-                   ((erc-current-nick-p nick)
-                    (setq buffer (erc erc-session-server erc-session-port
-                                      nick erc-session-user-full-name
-                                      nil nil
-                                      erc-default-recipients chnl erc-process))
-                    (when buffer
-                      (set-buffer buffer)
-                      (erc-add-default-channel chnl)
-                      (erc-send-command (format "MODE %s" chnl)))
-                    (erc-with-buffer (chnl proc)
-                      (erc-channel-begin-receiving-names))
-                    (erc-update-mode-line)
-                    (run-hooks 'erc-join-hook)
-                    (erc-make-notice
-                     (erc-format-message 'JOIN-you ?c chnl)))
-                   (t
-                    (setq buffer (erc-get-buffer chnl proc))
-                    (erc-make-notice
-                     (erc-format-message
-                      'JOIN ?n nick ?u login ?h host ?c chnl))))))
-        (when buffer (set-buffer buffer))
-        (erc-update-channel-member chnl nick nick t nil nil host login)
-        ;; on join, we want to stay in the new channel buffer
-        ;;(set-buffer ob)
-	(erc-display-message parsed nil buffer str)))))
+      (save-excursion
+	(let* ((str (cond
+		     ;; If I have joined a channel
+		     ((erc-current-nick-p nick)
+		      (setq buffer (erc erc-session-server erc-session-port
+					nick erc-session-user-full-name
+					nil nil
+					erc-default-recipients chnl erc-process))
+		      (when buffer
+			(set-buffer buffer)
+			(erc-add-default-channel chnl)
+			(erc-send-command (format "MODE %s" chnl)))
+		      (erc-with-buffer (chnl proc)
+				       (erc-channel-begin-receiving-names))
+		      (erc-update-mode-line)
+		      (run-hooks 'erc-join-hook)
+		      (erc-make-notice
+		       (erc-format-message 'JOIN-you ?c chnl)))
+		     (t
+		      (setq buffer (erc-get-buffer chnl proc))
+		      (erc-make-notice
+		       (erc-format-message
+			'JOIN ?n nick ?u login ?h host ?c chnl))))))
+	  (when buffer (set-buffer buffer))
+	  (erc-update-channel-member chnl nick nick t nil nil host login)
+	  ;; on join, we want to stay in the new channel buffer
+	  ;;(set-buffer ob)
+	  (erc-display-message parsed nil buffer str))))))
 
 (define-erc-response-handler (KICK)
   "Handle kick messages received from the server." nil
 
 (require 'erc)
 (require 'flyspell)
-(require 'ispell)
 
 (defconst erc-spelling-version "$Revision$"
   "ERC spelling revision.")