Synch to Oort Gnus 200303270624.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 504916a..7988961 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2003-03-27  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lpath.el: Bind url-current-object for FSF Emacs; bind
+       gnus-agent-expire-current-dirs for XEmacs; fbind open-ssl-stream
+       for both Emacsen.
+
+2003-03-27  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-sum.el (gnus-article-loose-mime)
+       (gnus-article-emulate-mime): Move to gnus-article-mime customize
+       group.
+
+       * gnus-msg.el (gnus-mailing-list-groups): Fix customize type and
+       doc string.
+
 2003-03-26  Kevin Ryde <user42@zip.com.au>
 
        * gnus-sum.el (gnus-summary-find-for-reselect): Renamed from

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index ae0185f..83db06b 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -75,12 +75,13 @@ of names)."
                 (function)))
 
 (defcustom gnus-mailing-list-groups nil
-  "*Regexp matching groups that are really mailing lists.
+  "*If non-nil a regexp matching groups that are really mailing lists.
 This is useful when you're reading a mailing list that has been
 gatewayed to a newsgroup, and you want to followup to an article in
 the group."
   :group 'gnus-message
-  :type 'regexp)
+  :type '(choice (regexp)
+                (const nil)))
 
 (defcustom gnus-add-to-list nil
   "*If non-nil, add a `to-list' parameter automatically."

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 69f4f84..ba15cef 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1126,7 +1126,7 @@ Set it to non-nil, Gnus will treat some articles as MIME even if
 the MIME-Version header is missed."
   :version "21.3"
   :type 'boolean
-  :group 'gnus-article)
+  :group 'gnus-article-mime)
 
 (defcustom gnus-article-emulate-mime t
   "If non-nil, use MIME emulation for uuencode and the like.
@@ -1134,7 +1134,7 @@ This means that Gnus will search message bodies for text that look
 like uuencoded bits, yEncoded bits, and so on, and present that using
 the normal Gnus MIME machinery."
   :type 'boolean
-  :group 'gnus-article)
+  :group 'gnus-article-mime)
 
 ;;; Internal variables
 

diff --git a/lisp/lpath.el b/lisp/lpath.el
index c84539b..6ecb2cf 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -13,13 +13,13 @@
               create-image display-graphic-p
               display-time-event-handler find-image image-size
               image-type-available-p insert-image
-              make-mode-line-mouse-map make-temp-file propertize
-              put-image replace-regexp-in-string rmail-msg-is-pruned
-              rmail-msg-restore-non-pruned-header sort-coding-systems
-              spam-BBDB-register-routine spam-enter-ham-BBDB
-              tool-bar-add-item tool-bar-add-item-from-menu
-              tool-bar-local-item-from-menu url-http-file-exists-p
-              vcard-pretty-print w32-focus-frame
+              make-mode-line-mouse-map make-temp-file open-ssl-stream
+              propertize put-image replace-regexp-in-string
+              rmail-msg-is-pruned rmail-msg-restore-non-pruned-header
+              sort-coding-systems spam-BBDB-register-routine
+              spam-enter-ham-BBDB tool-bar-add-item
+              tool-bar-add-item-from-menu tool-bar-local-item-from-menu
+              url-http-file-exists-p vcard-pretty-print w32-focus-frame
               w3m-charset-to-coding-system x-focus-frame))
 (maybe-bind '(filladapt-mode
              mc-pgp-always-sign mm-w3m-mode-map rmail-enable-mime-composing
@@ -48,8 +48,8 @@
                    buffer-display-table buffer-file-coding-system
                    current-language-environment
                    default-enable-multibyte-characters
-                   enable-multibyte-characters language-info-alist
-                   mark-active mouse-selection-click-count
+                   enable-multibyte-characters gnus-agent-expire-current-dirs
+                   language-info-alist mark-active mouse-selection-click-count
                    mouse-selection-click-count-buffer pgg-parse-crc24
                    temporary-file-directory transient-mark-mode)))
   (maybe-fbind '(bbdb-complete-name
@@ -64,7 +64,8 @@
                 w3-prepare-buffer w3-region w3m-region window-pixel-height
                 window-pixel-width))
   (maybe-bind '(help-echo-owns-message
-               mail-mode-hook url-package-name url-package-version
+               mail-mode-hook
+               url-current-object url-package-name url-package-version
                w3-meta-charset-content-type-regexp
                w3-meta-content-type-charset-regexp)))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 8cd29f6..2b727f6 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-27  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Adaptive Scoring): Fix.
+
 2003-03-23  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (Direct Functions, Common Variables)

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 28d1c19..8134cdf 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -18526,7 +18526,7 @@ gnus \e$B$K$O$3$l$i$rA4$F<+F0E*$K\e(B --- \e$B$^$k$GKbK!$G$b;H$C$?$h$&$K:n@.\e(B
 \e$B$&$A$?$@0l$D$7$+E,MQ$5$l$^$;$s!#\e(B
 
 @code{gnus-del-mark} \e$B$rNc$K<h$j$^$7$g$&\e(B --- \e$B$3$NO"A[%j%9%H$G$N0UL#$O!"$3\e(B
-\e$B$N0u\e(B (\e$B$9$J$o$A\e(B @samp{D} \e$B$N0u\e(B)\e$B$,$D$$$F$$$k5-;v$OA4$F!"\e(B@code{From} \e$B%X%C%@!<\e(B
+\e$B$N0u\e(B (\e$B$9$J$o$A\e(B @samp{e} \e$B$N0u\e(B)\e$B$,$D$$$F$$$k5-;v$OA4$F!"\e(B@code{From} \e$B%X%C%@!<\e(B
 \e$B$r$b$H$K\e(B -4 \e$B2<$2$i$l\e(B @code{Subject} \e$B$G\e(B -1 \e$B2<$2$i$l$k%9%3%"EPO?$,DI2C$5$l\e(B
 \e$B$^$9!#$3$l$r$"$J$?$NJP8+$K9g$o$;$FJQ99$7$F$/$@$5$$!#\e(B
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index dbb31d4..79e8ab5 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -18916,7 +18916,7 @@ Each article can have only one mark, so just a single of these rules
 will be applied to each article.
 
 To take @code{gnus-del-mark} as an example---this alist says that all
-articles that have that mark (i.e., are marked with @samp{D}) will have a
+articles that have that mark (i.e., are marked with @samp{e}) will have a
 score entry added to lower based on the @code{From} header by -4, and
 lowered by @code{Subject} by -1.  Change this to fit your prejudices.