(gnus-emphasis-alist): Disable the strikethru thingy.

2 files changed, 21 insertions, 14 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83b5e3820e6..36d17afab2d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,10 +1,14 @@
+2005-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gnus-art.el (gnus-emphasis-alist): Disable the strikethru thingy.
+
 2005-06-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * pop3.el (pop3-md5): Run md5 in the binary mode.
         (pop3-md5-program-args): New variable.
 
-        * starttls.el (starttls-set-process-query-on-exit-flag): Use
-        eval-and-compile.
+        * starttls.el (starttls-set-process-query-on-exit-flag):
+        Use eval-and-compile.
 
 2005-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -29,8 +33,8 @@
 
         * mml2015.el: Bind pgg-default-user-id when compiling.
 
-        * nndraft.el (nndraft-request-associate-buffer): Use
-        write-contents-functions instead of write-contents-hooks if it is
+        * nndraft.el (nndraft-request-associate-buffer):
+        Use write-contents-functions instead of write-contents-hooks if it is
         available.
 
         * nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
@@ -195,7 +199,7 @@
         (gnus-summary-high-unread-face): Ditto.
         (gnus-summary-low-unread-face): Ditto.
         (gnus-summary-normal-unread-face): Ditto.
-        (gnus-summary-high-read-face, gnus-summary-low-read-face): Diito
+        (gnus-summary-high-read-face, gnus-summary-low-read-face): Ditto.
         (gnus-summary-normal-read-face, gnus-splash-face): Ditto.
 
         * message.el (message-minibuffer-local-map): Add :group.
@@ -205,7 +209,7 @@
         (sieve-manage-server-eol, sieve-manage-client-eol): Ditto.
         (sieve-manage-streams, sieve-manage-stream-alist): Ditto.
         (sieve-manage-authenticators): Ditto.
-        (sieve-manage-authenticator-alist): Ditto
+        (sieve-manage-authenticator-alist): Ditto.
         (sieve-manage-default-port): Ditto.
 
         * sieve-mode.el (sieve-control-commands-face): Add :group.
@@ -438,11 +442,11 @@
 
         * nnimap.el (nnimap-date-days-ago): Ditto.
 
-        * gnus-demon.el (parse-time-string): Added autoload.
+        * gnus-demon.el (parse-time-string): Add autoload.
 
-        * gnus-delay.el (parse-time-string): Added autoload.
+        * gnus-delay.el (parse-time-string): Add autoload.
 
-        * gnus-art.el (parse-time-string): Added autoload.
+        * gnus-art.el (parse-time-string): Add autoload.
 
         * nnultimate.el (parse-time): Require for `parse-time-string'.
 
@@ -496,14 +500,13 @@
         (rfc2047-encoded-word-regexp): Don't use shy group.
         (rfc2047-decode-region): Follow rfc2047-encoded-word-regexp change.
         (rfc2047-parse-and-decode): Ditto.
-        (rfc2047-decode): Treat the ascii coding-system as raw-text by
-        default.
+        (rfc2047-decode): Treat the ascii coding-system as raw-text by default.
 
 2005-03-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * rfc2047.el (rfc2047-encode-encoded-words): New variable.
         (rfc2047-field-value): Strip props.
-        (rfc2047-encode-message-header): Disabled header folding -- not
+        (rfc2047-encode-message-header): Disable header folding -- not
         all headers can be folded, and this should be done by the message
         composition mode.  Probably.  I think.
         (rfc2047-encodable-p): Say that =? needs encoding.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 4af363c6b2e..7bc2e938071 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -367,8 +367,12 @@ advertisements.  For example:
                       (or (nth 4 spec) 3)
                       (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
               types))
-     '(("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
-        2 3 gnus-emphasis-strikethru)
+     '(;; I've never seen anyone use this strikethru convention whereas I've
+       ;; several times seen it triggered by normal text.  --Stef
+       ;; Miles suggests that this form is sometimes used but for italics,
+       ;; so maybe we should map it to `italic'.
+       ;; ("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
+       ;; 2 3 gnus-emphasis-strikethru)
        ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
         2 3 gnus-emphasis-underline))))
   "*Alist that says how to fontify certain phrases.