* gnus.el (gnus-interactive): Fix mismatched parentheses.

* nnshimbun.el: Enclose w3m stuff with `eval-and-compile';
 bind `w3m-work-buffer-name' and `w3m-retrieve' when compiling.

diff --git a/ChangeLog b/ChangeLog
index b814f75..01580b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-10  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/gnus.el (gnus-interactive): Fix mismatched parentheses.
+
+       * lisp/nnshimbun.el: Enclose w3m stuff with `eval-and-compile';
+       bind `w3m-work-buffer-name' and `w3m-retrieve' when compiling.
+
 2001-04-03  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
        * lisp/nnshimbun.el (nnshimbun-type-definition: Follow changes in

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 55add41..4f320a9 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2282,8 +2282,8 @@ g -- Group name."
        out)
       (cond
        ((= c ?r)
-       (push (if (< (point) (mark) (point) (mark))) out)
-       (push (if (> (point) (mark) (point) (mark))) out))))
+       (push (if (< (point) (mark)) (point) (mark)) out)
+       (push (if (> (point) (mark)) (point) (mark)) out))))
     (setq out (delq 'gnus-prefix-nil out))
     (nreverse out)))
 

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index f497435..f661ccc 100644 (file)
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -313,8 +313,12 @@ for a charset indication")
   (eval-and-compile
     (defalias-maybe 'coding-system-category 'get-code-mnemonic)))
 
-(if (and (ignore-errors (require 'w3m))
-        (fboundp 'w3m-retrieve))
+(eval-when-compile
+  (defvar w3m-work-buffer-name)
+  (autoload 'w3m-retrieve "w3m"))
+(eval-and-compile
+  (if (and (ignore-errors (require 'w3m))
+          (fboundp 'w3m-retrieve))
 ;; When w3m.el is available.
 (defun nnshimbun-retrieve-url (url &optional no-cache)
   "Rertrieve URL contents and insert to current buffer."
@@ -388,7 +392,7 @@ for a charset indication")
     (set-buffer buf)
     (insert-buffer url-working-buffer)
     (kill-buffer url-working-buffer)))
-)
+))
 
 (deffoo nnshimbun-request-article (article &optional group server to-buffer)
   (when (nnshimbun-possibly-change-group group server)