Add workaround when compiling with XEmacs 21.5.

diff --git a/lisp/COMPILE b/lisp/COMPILE
index f4ab37a..72452dd 100644 (file)
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -105,7 +105,10 @@
     (let ((source (expand-file-name
                   (concat (car command-line-args-left) ".el"))))
       (if (file-newer-than-file-p source (concat source "c"))
-         (byte-compile-file source)))))
+         (byte-compile-file source))))
+  ;; Workaround for an XEmacs 21.5 bug ("xemacs -batch -f <func> <arg1>"
+  ;; attempts to open <arg1> as a file after <func>).
+  (setq command-line-args-left (cdr command-line-args-left)))
 
 (defun riece-install-modules (modules srcdir lispdir just-print)
   (unless (or just-print (file-exists-p lispdir))
@@ -196,11 +199,18 @@
       (riece-mcat-update files (concat (symbol-name (car pointer)) ".el")
                         (intern (concat (symbol-name (car pointer))
                                         "-alist")))
-      (setq pointer (cdr pointer)))))
+      (setq pointer (cdr pointer))))
+  ;; Workaround for an XEmacs 21.5 bug ("xemacs -batch -f <func> <arg1>"
+  ;; attempts to open <arg1> as a file after <func>).
+  (setq command-line-args-left (cdr command-line-args-left)))
 
 (defun riece-compile ()
   (let ((srcdir (car command-line-args-left)))
-    (riece-compile-modules (riece-examine-modules srcdir) srcdir)))
+    (setq command-line-args-left (cdr command-line-args-left))
+    (riece-compile-modules (riece-examine-modules srcdir) srcdir))
+  ;; Workaround for an XEmacs 21.5 bug ("xemacs -batch -f <func> <arg1>"
+  ;; attempts to open <arg1> as a file after <func>).
+  (setq command-line-args-left (cdr command-line-args-left)))
 
 (defun riece-install ()
   (let ((srcdir (car command-line-args-left))

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58b2be5..f400ef7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-16  Daiki Ueno  <ueno@unixuser.org>
+
+       * COMPILE (riece-compile-module, riece-update-mcat)
+       (riece-compile): Add workaround for XEmacs 21.5.
+
 2011-01-25  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * riece-ignore.el: Add newline at end of file.