[Erc-help] [S] [PATCH] packages: Fix mis-compiled erc macros

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

SUPERSEDES <8yi...@sm...>

Hello Hrvoje, hello James!

I have reworked my patch to address your valuable feedback.

ERC Developers, please see
http://labb.contactor.se/~matsl/smoketest/logs/2004-03-15_23-01_macro_err_1.txt
for the miscompiled erc macros this patch is addressing.

Hrvoje, the set-buffer-multibyte handling should be OK, since that
function also already sets the relevant file coding system variables.

The requiring of the 'erc feature at the top-level is much better in
this case, since no optimized enabling of autoloaded functionalty is
involved at all.

Please review and send your feedback.

I intend to commit to the xemacs repository in a few days and upstream
at SourceForge.net as well.

Please advise,

Adrian
 
packages ChangeLog patch:
Diff command:   cvs -q diff -U 0
Files affected: xemacs-packages/erc/ChangeLog

Index: xemacs-packages/erc/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v
retrieving revision 1.10
diff -u -U0 -r1.10 ChangeLog
--- xemacs-packages/erc/ChangeLog	19 Mar 2004 01:30:49 -0000	1.10
+++ xemacs-packages/erc/ChangeLog	19 Mar 2004 01:51:06 -0000
@@ -2,0 +3,8 @@
+	* erc-dcc.el (erc-dcc-get-file): XEmacs does not have
+	`set-buffer-multibyte'.  Setting of file coding variables takes
+	care of XEmacs.
+	* erc-members.el: Fix miscompiled macro by
+	requiring defining feature at the top-level.
+
+2004-03-19  Adrian Aichner  <ad...@xe...>
+

packages source patch:
Diff command:   cvs -f -z3 -q diff -u -N
Files affected: xemacs-packages/erc/erc-members.el xemacs-packages/erc/erc-dcc.el

Index: xemacs-packages/erc/erc-dcc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-dcc.el,v
retrieving revision 1.4
diff -u -r1.4 erc-dcc.el
--- xemacs-packages/erc/erc-dcc.el	19 Mar 2004 01:30:49 -0000	1.4
+++ xemacs-packages/erc/erc-dcc.el	19 Mar 2004 01:39:05 -0000
@@ -808,8 +808,12 @@
          proc)
     (with-current-buffer buffer
       (fundamental-mode)
-      ;; This is necessary to have the buffer saved as-is.
-      (set-buffer-multibyte nil)
+      ;; This is necessary to have the buffer saved as-is in GNU
+      ;; Emacs.
+      ;; XEmacs change: We don't have `set-buffer-multibyte', setting
+      ;; coding system to 'binary below takes care of us.
+      (when (fboundp 'set-buffer-multibyte)
+	(set-buffer-multibyte nil))
 
       (setq mode-line-process '(":%s")
 	    buffer-file-type t
Index: xemacs-packages/erc/erc-members.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-members.el,v
retrieving revision 1.2
diff -u -r1.2 erc-members.el
--- xemacs-packages/erc/erc-members.el	19 Mar 2004 01:30:49 -0000	1.2
+++ xemacs-packages/erc/erc-members.el	19 Mar 2004 01:39:05 -0000
@@ -35,6 +35,13 @@
 
 ;;; Code:
 
+;; Avoid miscompiling macro `erc-log' and `with-erc-channel-buffer' in
+;; absence of loaded definition from 'erc.
+;; See 2004-03-15_23-01_macro_err_1.txt in
+;; http://labb.contactor.se/~matsl/smoketest/logs/
+;; or newer results for miscompiled macros.
+(eval-when-compile (require 'erc))
+
 (require 'cl); for defstruct
 
 (defvar erc-members (makehash 'eq)

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