Synch to Oort Gnus 200304201344.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04b4437..489bcd5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2003-04-20  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-gssapi-open, imap-ssl-open): Erase buffer before
+       starting process, like imap-kerberos4-open does.
+
+       * mml-smime.el, rfc1843.el, dig.el, smime.el, uudecode.el: Fix
+       license template.
+
+       * mml-sec.el: Fix license template.
+
+       * gnus-sieve.el, sieve.el, sieve-manage.el, sieve-mode.el: Fix
+       license template.
+
+       * pgg-def.el, pgg.el, pgg-gpg.el, pgg-parse.el, pgg-pgp5.el,
+       pgg-pgp.el: Fix license template.
+
 2003-04-19  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-sum.el (gnus-summary-delete-article): Improve docstring.

diff --git a/lisp/dig.el b/lisp/dig.el
index 953dc1d..e71d6db 100644 (file)
--- a/lisp/dig.el
+++ b/lisp/dig.el
@@ -4,7 +4,7 @@
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS BIND dig
 
-;; This file is not a part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published

diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el
index d4e557c..d8133a7 100644 (file)
--- a/lisp/gnus-sieve.el
+++ b/lisp/gnus-sieve.el
@@ -4,7 +4,7 @@
 ;; Author: NAGY Andras <nagya@inf.elte.hu>,
 ;;     Simon Josefsson <simon@josefsson.org>
 
-;; This file is not part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/lisp/imap.el b/lisp/imap.el
index 15a7b60..88dda14 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -532,6 +532,7 @@ sure of changing the value of `foo'."
        cmd done)
     (while (and (not done) (setq cmd (pop cmds)))
       (message "Opening GSSAPI IMAP connection with `%s'..." cmd)
+      (erase-buffer)
       (let* ((port (or port imap-default-port))
             (process-connection-type imap-process-connection-type)
             (process (as-binary-process
@@ -595,6 +596,7 @@ sure of changing the value of `foo'."
        cmd done)
     (while (and (not done) (setq cmd (pop cmds)))
       (message "imap: Opening SSL connection with `%s'..." cmd)
+      (erase-buffer)
       (let ((port (or port imap-default-ssl-port))
            (process-connection-type nil)
            process)

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index a55e170..942a312 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -2,7 +2,8 @@
 ;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
-;; This file is not part of GNU Emacs, but the same permissions apply.
+
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 5939b08..bccc8a1 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -1,10 +1,10 @@
 ;;; mml-smime.el --- S/MIME support for MML
-;; Copyright (c) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: Gnus, MIME, S/MIME, MML
 
-;; This file is a part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published

diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index cba8ece..16260cb 100644 (file)
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -1,10 +1,10 @@
 ;;; rfc1843.el --- HZ (rfc1843) decoding
-;; Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (c) 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news HZ HZ+ mail i18n
 
-;; This file is a part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index b3015ab..8897dd1 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -3,7 +3,7 @@
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
-;; This file is not part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/lisp/sieve-mode.el b/lisp/sieve-mode.el
index f47b5d0..e804e96 100644 (file)
--- a/lisp/sieve-mode.el
+++ b/lisp/sieve-mode.el
@@ -3,7 +3,7 @@
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
-;; This file is not part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/lisp/sieve.el b/lisp/sieve.el
index ad62856..da2016b 100644 (file)
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -3,7 +3,7 @@
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
-;; This file is not part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/lisp/smime.el b/lisp/smime.el
index dc47c13..f61e9c0 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -1,10 +1,10 @@
 ;;; smime.el --- S/MIME support library
-;; Copyright (c) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: SMIME X.509 PEM OpenSSL
 
-;; This file is not a part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published

diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index 98b1afd..ffb2eee 100644 (file)
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -1,11 +1,11 @@
 ;;; uudecode.el -- elisp native uudecode
 
-;; Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (c) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: uudecode news
 
-;; This file is a part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

diff --git a/texi/ChangeLog b/texi/ChangeLog
index a3004ce..cfd4ec6 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-20  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Summary Buffer Lines): Add
+       gnus-sum-thread-tree-false-root.
+
 2003-04-15  Michael Shields  <shields@msrl.com>
 
        * gnus.texi (Group Parameters, Hiding Headers): Document that

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2fdb0e3..89de419 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -4570,6 +4570,11 @@ Gnus \e$B$OJQ?t\e(B @code{gnus-extract-address-components} \e$B$NCM$r\e(B @code{From
 \e$B%9%l%C%I$N:,\e(B (root) \e$B$K;H$o$l$^$9!#\e(B@code{nil} \e$B$@$C$?$i!"Be$o$j$KBjL>$r;H\e(B
 \e$B$$$^$9!#%G%#%U%)%k%H$O\e(B @samp{> } \e$B$G$9!#\e(B
 
+@item gnus-sum-thread-tree-false-root
+@vindex gnus-sum-thread-tree-false-root
+\e$B%9%l%C%I$N$K$;$N:,$K;H$o$l$^$9\e(B (@pxref{Loose Threads})\e$B!#\e(B@code{nil} \e$B$@$C\e(B
+\e$B$?$i!"Be$o$j$KBjL>$r;H$$$^$9!#%G%#%U%)%k%H$O\e(B @samp{> } \e$B$G$9!#\e(B
+
 @item gnus-sum-thread-tree-single-indent
 @vindex gnus-sum-thread-tree-single-indent
 \e$BC10l$N%a%C%;!<%8$N%9%l%C%I$K;H$o$l$^$9!#\e(B@code{nil} \e$B$@$C$?$i!"Be$o$j$KBj\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index a87de2b..8c8bc74 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -4524,7 +4524,12 @@ glyphs.
 @item gnus-sum-thread-tree-root
 @vindex gnus-sum-thread-tree-root
 Used for the root of a thread.  If @code{nil}, use subject
-instead. The default is @samp{> }.
+instead.  The default is @samp{> }.
+
+@item gnus-sum-thread-tree-false-root
+@vindex gnus-sum-thread-tree-false-root
+Used for the false root of a thread (@pxref{Loose Threads}).  If
+@code{nil}, use subject instead.  The default is @samp{> }.
 
 @item gnus-sum-thread-tree-single-indent
 @vindex gnus-sum-thread-tree-single-indent