Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a6ac1f..a103e3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2000-10-13  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * mail-source.el (defvar mail-source-keyword-map): Use
+       `rmail-spool-directory' as a default directory for the `file'
+       source, if the variable is defined.  Fall back to hardcoded
+       "/usr/spool/mail/", as before.  Suggestion by Steven E. Harris
+       <seh@speakeasy.org>.
+
+2000-10-13 12:01:15  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-send-mail-partially): Replace the header
+        delimiter with a blank line.
+
+2000-10-13  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-sum.el (gnus-get-split-value): Use first match only (Ed L
+       Cashin <ecashin@coe.uga.edu>).
+
+2000-10-13 10:52:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-ems.el (gnus-article-compface-xbm): Ignore errors.
+
 2000-10-11  John Wiegley  <johnw@gnu.org>
 
        * gnus-topic.el (gnus-topic-mode): Use `setq' to clear

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index c9648a3..3a2fedc 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -215,8 +215,10 @@
   "Length of the ring used for `gnus-article-xface-ring-internal'.")
 
 (defvar gnus-article-compface-xbm
-  (when (and (not (featurep 'xemacs)) (>= emacs-major-version 21))
-    (eq 0 (string-match "#define" (shell-command-to-string "uncompface -X"))))
+  (condition-case ()
+      (eq 0 (string-match "#define"
+                         (shell-command-to-string "uncompface -X")))
+    (error nil))
   "Non-nil means the compface program supports the -X option.
 That produces XBM output.")
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 46f283e..7c38845 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9258,7 +9258,7 @@ save those articles instead."
        (set-buffer gnus-original-article-buffer)
        (save-restriction
          (nnheader-narrow-to-headers)
-         (while methods
+         (while (and methods (not split-name))
            (goto-char (point-min))
            (setq method (pop methods))
            (setq match (car method))
@@ -9277,7 +9277,7 @@ save those articles instead."
                    (save-restriction
                      (widen)
                      (setq result (eval match)))))
-             (setq split-name (append (cdr method) split-name))
+             (setq split-name (cdr method))
              (cond ((stringp result)
                     (push (expand-file-name
                            result gnus-article-save-directory)

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index be317c8..ab45688 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -235,7 +235,10 @@ Common keywords should be listed here.")
        (:prescript-delay)
        (:postscript)
        (:path (or (getenv "MAIL")
-                 (concat "/usr/spool/mail/" (user-login-name)))))
+                  (and (boundp 'rmail-spool-directory)
+                       (expand-file-name (user-login-name)
+                                         rmail-spool-directory))
+                 (expand-file-name (user-login-name) "/usr/spool/mail/"))))
       (directory
        (:path)
        (:suffix ".spool")

diff --git a/lisp/message.el b/lisp/message.el
index 489c5f1..b7664b7 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2829,6 +2829,12 @@ This sub function is for exclusive use of `message-send-mail'."
 
 (defun message-send-mail-partially ()
   "Sendmail as message/partial."
+  ;; replace the header delimiter with a blank line
+  (goto-char (point-min))
+  (re-search-forward
+   (concat "^" (regexp-quote mail-header-separator) "\n"))
+  (replace-match "\n")
+  (run-hooks 'message-send-mail-hook)
   (let ((p (goto-char (point-min)))
        (tembuf (message-generate-new-buffer-clone-locals " message temp"))
        (curbuf (current-buffer))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 523243b..8ab668e 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-05  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus.texi (Windows Configuration): add examples; first example
+       suggested by Stein A. Str\e,Ax\e(Bmme <stromme@mi.uib.no>.  (The actual
+       Lisp code is also from him.)
+
 2000-10-07  Dave Love  <fx@gnu.org>
 
        * doclicense.texi: New file.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 6a9938f..9a9c3f7 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -16767,6 +16767,42 @@ The GNU Emacs Lisp Reference Manual}. XEmacs \e$B$G$O!"%U%l!<%`%W%m%Q%F%#%j\e(B
 \e$B%&%#%s%I%&$GI=<($5$l$k$J$i!"%&%#%s%I%&$NBg$-$5$,JQ99$5$l$k$3$H$rHr$1$k$?\e(B
 \e$B$a$K\e(B @code{gnus-tree-minimize-window} \e$B$r$$$8$k$N$,NI$$$G$7$g$&!#\e(B
 
+@subsection \e$B%&%#%s%I%&@_Dj$NNc\e(B
+
+@itemize @bullet
+@item 
+\e$B:8B&$r69$a$F%0%k!<%W%P%C%U%!$K!#1&B&$rJ,3d$7$F35N,%P%C%U%!\e(B (\e$B>e\e(B 1/6) \e$B$H\e(B
+\e$B5-;v%P%C%U%!\e(B (\e$B2<\e(B) \e$B$K!#\e(B
+
+@ifinfo
+@example
++---+---------+
+| G | Summary |
+| r +---------+
+| o |         |
+| u | Article |
+| p |         |
++---+---------+
+@end example
+@end ifinfo
+
+@lisp
+(gnus-add-configuration
+ '(article
+   (horizontal 1.0
+               (vertical 25 (group 1.0))
+               (vertical 1.0
+                         (summary 0.16 point)
+                         (article 1.0)))))
+
+(gnus-add-configuration
+ '(summary
+   (horizontal 1.0
+               (vertical 25 (group 1.0))
+               (vertical 1.0 (summary 1.0 point)))))
+@end lisp
+@end itemize
+
 @node Faces and Fonts
 @section \e$B%U%'%$%9$H%U%)%s%H\e(B
 @cindex faces

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 2df6fbd..60a0090 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -17364,6 +17364,43 @@ window is displayed vertically next to another window, you may also want
 to fiddle with @code{gnus-tree-minimize-window} to avoid having the
 windows resized.
 
+@subsection Example Window Configurations
+
+@itemize @bullet
+@item 
+Narrow left hand side occupied by group buffer.  Right hand side split
+between summary buffer (top one-sixth) and article buffer (bottom).
+
+@ifinfo
+@example
++---+---------+
+| G | Summary |
+| r +---------+
+| o |         |
+| u | Article |
+| p |         |
++---+---------+
+@end example
+@end ifinfo
+
+@lisp
+(gnus-add-configuration
+ '(article
+   (horizontal 1.0
+               (vertical 25 (group 1.0))
+               (vertical 1.0
+                         (summary 0.16 point)
+                         (article 1.0)))))
+
+(gnus-add-configuration
+ '(summary
+   (horizontal 1.0
+               (vertical 25 (group 1.0))
+               (vertical 1.0 (summary 1.0 point)))))
+@end lisp
+
+@end itemize
+
 
 @node Faces and Fonts
 @section Faces and Fonts