Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fb74a3..5557c06 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-22  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-art.el (gnus-emphasis-alist): Strikethru had a lot of false
+       positives, make it stricter.  From Jochen Hein (trivial change).
+
 2002-08-21  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * gnus.el (gnus-other-frame): Trivial fix.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 404e47c..8644ded 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -322,7 +322,6 @@ directly.")
         '(("\\*" "\\*" bold)
           ("_" "_" underline)
           ("/" "/" italic)
-          ("-" "-" strikethru)
           ("_/" "/_" underline-italic)
           ("_\\*" "\\*_" underline-bold)
           ("\\*/" "/\\*" bold-italic)
@@ -333,6 +332,8 @@ directly.")
            (format format (car spec) (car (cdr spec)))
            2 3 (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
         types)
+       ("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
+        2 3 gnus-emphasis-strikethru)
        ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
         2 3 gnus-emphasis-underline)))
   "*Alist that says how to fontify certain phrases.