2 files changed, 26 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 94a05ae2c20..ba5f53662c3 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2000-12-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (article-treat-dumbquotes): Quote \.
+
+2000-12-21  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+        * gnus-art.el (gnus-treat-emphasize): Don't treat emphasis if
+        Emacs 20 runs on a terminal.
+
+2000-12-21  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+        * gnus-art.el (article-treat-dumbquotes): More doc, provided by
+        Paul Stevenson <p.stevenson@surrey.ac.uk>
+
 2000-12-21 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * mml.el (gnus-add-minor-mode): Autoload.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c1d7a62df57..2666bcffb58 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -731,7 +731,11 @@ See the manual for details."
   :type gnus-article-treat-head-custom)
 (put 'gnus-treat-buttonize-head 'highlight t)
 
-(defcustom gnus-treat-emphasize 50000
+(defcustom gnus-treat-emphasize 
+  (and (or window-system
+           (featurep 'xemacs)
+           (>= (string-to-number emacs-version) 21))
+       50000)
   "Emphasize text.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See the manual for details."
@@ -1317,9 +1321,14 @@ always hide."
           (forward-line 1))))))
 
 (defun article-treat-dumbquotes ()
-  "Translate M******** sm*rtq**t*s into proper text.
+  "Translate M****s*** sm*rtq**t*s into proper text.
 Note that this function guesses whether a character is a sm*rtq**t* or
-not, so it should only be used interactively."
+not, so it should only be used interactively.
+
+Sm*rtq**t*s are M****s***'s unilateral extension to the character map
+in an attempt to provide more quoting characters.  If you see
+something like \\222 or \\264 where you're expecting some kind of
+apostrophe or quotation mark, then try this wash."
   (interactive)
   (article-translate-strings gnus-article-dumbquotes-map))