Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 733656b..3bcd175 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-29  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * etc/smilies/sad.pbm: New bitmap.
+       * etc/smilies/blink.pbm: Ditto.
+       Contributed by Kim F. Storm <storm@cua.dk>.
+
 2001-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/message.el (rfc822-goto-eoh): Remove.

diff --git a/etc/smilies/blink.pbm b/etc/smilies/blink.pbm
new file mode 100644 (file)
index 0000000..6c7531b
Binary files /dev/null and b/etc/smilies/blink.pbm differ

diff --git a/etc/smilies/sad.pbm b/etc/smilies/sad.pbm
new file mode 100644 (file)
index 0000000..892e343
Binary files /dev/null and b/etc/smilies/sad.pbm differ

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea21e21..39d9216 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2001-10-29  Simon Josefsson  <jas@extundo.com>
+
+       * mml.el (mml-preview): Bind message-this-is-news if it is
+       news. From Jesper Harder <harder@myrealbox.com>.
+
+2001-10-28  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-sum.el (gnus-group-make-articles-read): Inline group.
+
+2001-10-29  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * smiley-ems.el (smiley-regexp-alist): Add support for sad and
+       ironic smilies.
+
 2001-10-27  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-indent-citation): Don't add trailing

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 38f0130..b2ebd68 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5158,7 +5158,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
             (gnus-info-set-marks ',info ',(gnus-info-marks info) t)
             (gnus-info-set-read ',info ',(gnus-info-read info))
             (gnus-get-unread-articles-in-group ',info (gnus-active ,group))
-            (gnus-request-set-mark group (list (list ',range 'del '(read))))
+            (gnus-request-set-mark ,group (list (list ',range 'del '(read))))
             (gnus-group-update-group ,group t))))
       ;; Add the read articles to the range.
       (gnus-info-set-read info range)

diff --git a/lisp/mml.el b/lisp/mml.el
index 2826144..a16c613 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -887,13 +887,14 @@ TYPE is the MIME type to use."
   "Display current buffer with Gnus, in a new buffer.
 If RAW, don't highlight the article."
   (interactive "P")
-  (let ((buf (current-buffer))
-       (message-options message-options)
-       (message-posting-charset (or (gnus-setup-posting-charset
-                                     (save-restriction
-                                       (message-narrow-to-headers-or-head)
-                                       (message-fetch-field "Newsgroups")))
-                                    message-posting-charset)))
+  (let* ((buf (current-buffer))
+        (message-options message-options)
+        (message-this-is-news (message-news-p))
+        (message-posting-charset (or (gnus-setup-posting-charset
+                                      (save-restriction
+                                        (message-narrow-to-headers-or-head)
+                                        (message-fetch-field "Newsgroups")))
+                                     message-posting-charset)))
     (message-options-set-recipient)
     (switch-to-buffer (generate-new-buffer
                       (concat (if raw "*Raw MIME preview of "

diff --git a/lisp/smiley-ems.el b/lisp/smiley-ems.el
index f2c28f0..876c88c 100644 (file)
--- a/lisp/smiley-ems.el
+++ b/lisp/smiley-ems.el
@@ -1,6 +1,6 @@
 ;;; smiley-ems.el --- displaying smiley faces
 
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
@@ -50,10 +50,11 @@
 
 ;; The XEmacs version has a baroque, if not rococo, set of these.
 (defcustom smiley-regexp-alist
-  ;; Perhaps :-) should be distinct -- it does appear in the Jargon File.
-  '(("\\([:;]-?)\\)\\W" 1 "smile.pbm")
+  '(("\\(:-?)\\)\\W" 1 "smile.pbm")
+    ("\\(;-?)\\)\\W" 1 "blink.pbm")
     ("\\(:-[/\\]\\)\\W" 1 "wry.pbm")
-    ("\\(:-[({]\\)\\W" 1 "frown.pbm"))
+    ("\\(:-(\\)\\W" 1 "sad.pbm")
+    ("\\(:-{\\)\\W" 1 "frown.pbm"))
   "*A list of regexps to map smilies to images.
 The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
 rgexp to replace with IMAGE.  IMAGE is the name of a PBM file in

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 4e591c6..ddd8c0f 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Customizing Articles): Sort list. Remove
+       duplicate. Suggested by Henrik Holm <henrik@tele.ntnu.no>.
+
 2001-10-27  Simon Josefsson  <jas@extundo.com>
 
        * message.texi (Insertion): Fix message-yank*-prefix.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index ae8ac9e..e6d1d99 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -9421,42 +9421,41 @@ GNUS \e$B$d\e(B Gnus \e$B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 \e$B$,!"$[$H$s$I$N?M$O$*$=$i$/$3$3$K0lMwI=<($5$l$F$$$k$b$N$G==J,$G$7$g$&!#\e(B
 
 @table @code
-@item gnus-treat-highlight-signature (t, last)
 @item gnus-treat-buttonize (t, integer)
 @item gnus-treat-buttonize-head (head)
+@item gnus-treat-capitalize-sentences (t, integer)
+@item gnus-treat-date-english (head)
+@item gnus-treat-date-iso8601 (head)
+@item gnus-treat-date-lapsed (head)
+@item gnus-treat-date-local (head)
+@item gnus-treat-date-original (head)
+@item gnus-treat-date-user-defined (head)
+@item gnus-treat-date-ut (head)
+@item gnus-treat-display-picons (head)
+@item gnus-treat-display-smileys (t, integer)
+@item gnus-treat-display-xface (head)
 @item gnus-treat-emphasize (t, head, integer)
 @item gnus-treat-fill-article (t, integer)
-@item gnus-treat-strip-cr (t, integer)
-@item gnus-treat-hide-headers (head)
+@item gnus-treat-fill-long-lines (t, integer)
 @item gnus-treat-hide-boring-headers (head)
-@item gnus-treat-hide-signature (t, last)
 @item gnus-treat-hide-citation (t, integer)
 @item gnus-treat-hide-citation-maybe (t, integer)
-@item gnus-treat-strip-pgp (t, last, integer)
-@item gnus-treat-x-pgp-sig (head)
-@item gnus-treat-strip-pem (t, last, integer)
-@item gnus-treat-highlight-headers (head)
+@item gnus-treat-hide-headers (head)
+@item gnus-treat-hide-signature (t, last)
 @item gnus-treat-highlight-citation (t, integer)
+@item gnus-treat-highlight-headers (head)
 @item gnus-treat-highlight-signature (t, last, integer)
-@item gnus-treat-date-ut (head)
-@item gnus-treat-date-local (head)
-@item gnus-treat-date-english (head)
-@item gnus-treat-date-lapsed (head)
-@item gnus-treat-date-original (head)
-@item gnus-treat-date-iso8601 (head)
-@item gnus-treat-date-user-defined (head)
+@item gnus-treat-overstrike (t, integer)
+@item gnus-treat-play-sounds
+@item gnus-treat-strip-cr (t, integer)
 @item gnus-treat-strip-headers-in-body (t, integer)
-@item gnus-treat-strip-trailing-blank-lines (t, last, integer)
 @item gnus-treat-strip-leading-blank-lines (t, integer)
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
-@item gnus-treat-overstrike (t, integer)
-@item gnus-treat-display-xface (head)
-@item gnus-treat-display-smileys (t, integer)
-@item gnus-treat-display-picons (head)
-@item gnus-treat-capitalize-sentences (t, integer)
-@item gnus-treat-fill-long-lines (t, integer)
-@item gnus-treat-play-sounds
+@item gnus-treat-strip-pem (t, last, integer)
+@item gnus-treat-strip-pgp (t, last, integer)
+@item gnus-treat-strip-trailing-blank-lines (t, last, integer)
 @item gnus-treat-translate
+@item gnus-treat-x-pgp-sig (head)
 @item gnus-treat-decode-article-as-default-mime-charset
 @end table
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index f012401..fdfb455 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9919,42 +9919,41 @@ group.  Values in parenthesis are suggested sensible values.  Others are
 possible but those listed are probably sufficient for most people.
 
 @table @code
-@item gnus-treat-highlight-signature (t, last)
 @item gnus-treat-buttonize (t, integer)
 @item gnus-treat-buttonize-head (head)
+@item gnus-treat-capitalize-sentences (t, integer)
+@item gnus-treat-date-english (head)
+@item gnus-treat-date-iso8601 (head)
+@item gnus-treat-date-lapsed (head)
+@item gnus-treat-date-local (head)
+@item gnus-treat-date-original (head)
+@item gnus-treat-date-user-defined (head)
+@item gnus-treat-date-ut (head)
+@item gnus-treat-display-picons (head)
+@item gnus-treat-display-smileys (t, integer)
+@item gnus-treat-display-xface (head)
 @item gnus-treat-emphasize (t, head, integer)
 @item gnus-treat-fill-article (t, integer)
-@item gnus-treat-strip-cr (t, integer)
-@item gnus-treat-hide-headers (head)
+@item gnus-treat-fill-long-lines (t, integer)
 @item gnus-treat-hide-boring-headers (head)
-@item gnus-treat-hide-signature (t, last)
 @item gnus-treat-hide-citation (t, integer)
 @item gnus-treat-hide-citation-maybe (t, integer)
-@item gnus-treat-strip-pgp (t, last, integer)
-@item gnus-treat-x-pgp-sig (head)
-@item gnus-treat-strip-pem (t, last, integer)
-@item gnus-treat-highlight-headers (head)
+@item gnus-treat-hide-headers (head)
+@item gnus-treat-hide-signature (t, last)
 @item gnus-treat-highlight-citation (t, integer)
+@item gnus-treat-highlight-headers (head)
 @item gnus-treat-highlight-signature (t, last, integer)
-@item gnus-treat-date-ut (head)
-@item gnus-treat-date-local (head)
-@item gnus-treat-date-english (head)
-@item gnus-treat-date-lapsed (head)
-@item gnus-treat-date-original (head)
-@item gnus-treat-date-iso8601 (head)
-@item gnus-treat-date-user-defined (head)
+@item gnus-treat-overstrike (t, integer)
+@item gnus-treat-play-sounds
+@item gnus-treat-strip-cr (t, integer)
 @item gnus-treat-strip-headers-in-body (t, integer)
-@item gnus-treat-strip-trailing-blank-lines (t, last, integer)
 @item gnus-treat-strip-leading-blank-lines (t, integer)
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
-@item gnus-treat-overstrike (t, integer)
-@item gnus-treat-display-xface (head)
-@item gnus-treat-display-smileys (t, integer)
-@item gnus-treat-display-picons (head)
-@item gnus-treat-capitalize-sentences (t, integer)
-@item gnus-treat-fill-long-lines (t, integer)
-@item gnus-treat-play-sounds
+@item gnus-treat-strip-pem (t, last, integer)
+@item gnus-treat-strip-pgp (t, last, integer)
+@item gnus-treat-strip-trailing-blank-lines (t, last, integer)
 @item gnus-treat-translate
+@item gnus-treat-x-pgp-sig (head)
 @item gnus-treat-decode-article-as-default-mime-charset
 @end table