From fc64a0c0e2ea88abfaff6416ce20173484548154 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 24 Sep 2019 00:42:47 +0200 Subject: [PATCH] Rename "dumbquotes" to "smartquotes" in Gnus * doc/misc/gnus.texi (Article Washing): Adjust documentation. * etc/refcards/gnus-refcard.tex (subsection*{Notes}): Ditto * lisp/gnus/gnus-art.el (gnus-article-smartquotes-map): Rename from gnus-article-dumbquotes-map and add obsolete alias. (article-treat-smartquotes): Ditto. * lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Adjust menus. --- doc/misc/gnus.texi | 20 ++++++++++---------- etc/refcards/gnus-refcard.tex | 2 +- lisp/gnus/deuglify.el | 7 ++++--- lisp/gnus/gnus-art.el | 24 +++++++++++++++--------- lisp/gnus/gnus-sum.el | 4 ++-- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index afa45d10f09..d8a257b00bf 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -9006,18 +9006,18 @@ Treat overstrike (@code{gnus-article-treat-overstrike}). @item W d @kindex W d @r{(Summary)} -@findex gnus-article-treat-dumbquotes -@vindex gnus-article-dumbquotes-map +@findex gnus-article-treat-smartquotes +@vindex gnus-article-smartquotes-map @cindex Smartquotes @cindex M****s*** sm*rtq**t*s @cindex Latin 1 -Treat M****s*** sm*rtq**t*s according to -@code{gnus-article-dumbquotes-map} -(@code{gnus-article-treat-dumbquotes}). Note that this function guesses -whether a character is a sm*rtq**t* or not, so it should only be used +Treat ``Microsoft smartquotes'' according to +@code{gnus-article-smartquotes-map} +(@code{gnus-article-treat-smartquotes}). Note that this function guesses +whether a character is a smartquote or not, so it should only be used interactively. -Sm*rtq**t*s are M****s***'s unilateral extension to the character map in +Smartquotes are Microsoft's unilateral extension to the character map in an attempt to provide more quoting characters. If you see something like @code{\222} or @code{\264} where you're expecting some kind of apostrophe or quotation mark, then try this wash. @@ -9037,9 +9037,9 @@ like. For instance, @samp{»} is translated into @samp{>>}, and so on. @kindex W Y f @r{(Summary)} @findex gnus-article-outlook-deuglify-article @cindex Outlook Express -Full deuglify of broken Outlook (Express) articles: Treat dumbquotes, -unwrap lines, repair attribution and rearrange citation. -(@code{gnus-article-outlook-deuglify-article}). +Full deuglify of broken Outlook (Express) articles: Treat +\"smartquotes\", unwrap lines, repair attribution and rearrange +citation (@code{gnus-article-outlook-deuglify-article}). @item W Y u @kindex W Y u @r{(Summary)} diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index a16f48dde02..7ecfc8217ef 100644 --- a/etc/refcards/gnus-refcard.tex +++ b/etc/refcards/gnus-refcard.tex @@ -670,7 +670,7 @@ W b & Make Message-IDs and URLs in the article mouse-clickable {\bf buttons}.\\ W c & Translate CRLF-pairs to LF and then remaining CR's to LF's.\\ - W d & Treat {\bf dumbquotes}.\\ + W d & Treat {\bf smartquotes}.\\ W e & Treat {\bf emphasized} text.\\ W h & Treat {\bf HTML}.\\ W l & (w) Remove page breaks ({\bf\^{}L}) from the article.\\ diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el index 2fdc34e3e18..3bf6a3aa2aa 100644 --- a/lisp/gnus/deuglify.el +++ b/lisp/gnus/deuglify.el @@ -456,11 +456,12 @@ If NODISPLAY is non-nil, don't redisplay the article buffer." ;;;###autoload (defun gnus-outlook-deuglify-article (&optional nodisplay) "Full deuglify of broken Outlook (Express) articles. -Treat dumbquotes, unwrap lines, repair attribution and rearrange citation. If -NODISPLAY is non-nil, don't redisplay the article buffer." +Treat \"smartquotes\", unwrap lines, repair attribution and +rearrange citation. If NODISPLAY is non-nil, don't redisplay the +article buffer." (interactive "P") ;; apply treatment of dumb quotes - (gnus-article-treat-dumbquotes) + (gnus-article-treat-smartquotes) ;; repair wrapped cited lines (gnus-article-outlook-unwrap-lines 'nodisplay) ;; repair attribution line and rearrange citation. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 07ec2696469..922bb99d706 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -894,7 +894,7 @@ images in Emacs." (defvar gnus-decode-address-function 'mail-decode-encoded-address-region "Function used to decode addresses.") -(defvar gnus-article-dumbquotes-map +(defvar gnus-article-smartquotes-map '((?\200 "EUR") (?\202 ",") (?\203 "f") @@ -915,6 +915,8 @@ images in Emacs." (?\234 "oe") (?\264 "'")) "Table for MS-to-Latin1 translation.") +(make-obsolete-variable 'gnus-article-dumbquotes-map + 'gnus-article-smartquotes-map "27.1") (defcustom gnus-ignored-mime-types nil "List of MIME types that should be ignored by Gnus." @@ -2074,18 +2076,20 @@ always hide." )) (forward-line 1)))))) -(defun article-treat-dumbquotes () - "Translate M****s*** sm*rtq**t*s and other symbols into proper text. -Note that this function guesses whether a character is a sm*rtq**t* or +(defun article-treat-smartquotes () + "Translate \"Microsoft smartquotes\" and other symbols into proper text. +Note that this function guesses whether a character is a smartquote or not, so it should only be used interactively. -Sm*rtq**t*s are M****s***'s unilateral extension to the +Smartquotes are Microsoft's unilateral extension to the iso-8859-1 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)) + (article-translate-strings gnus-article-smartquotes-map)) +(define-obsolete-function-alias 'article-treat-dumquotes + #'article-treat-smartquotes "27.1") (defvar org-entities) @@ -4371,11 +4375,13 @@ If variable `gnus-use-long-file-name' is non-nil, it is article-date-lapsed article-date-combined-lapsed article-emphasize + article-treat-smartquotes + ;; Obsolete alias. article-treat-dumbquotes article-treat-non-ascii - article-normalize-headers - ;;(article-show-all . gnus-article-show-all-headers) - ))) + article-normalize-headers))) +(define-obsolete-function-alias 'gnus-article-treat-dumbquotes + 'gnus-article-treat-smartquotes "27.1") ;;; ;;; Gnus article mode diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index d1751065505..9d6f4568274 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -2184,7 +2184,7 @@ increase the score of each group you read." "v" gnus-summary-verbose-headers "a" gnus-article-strip-headers-in-body ;; mnemonic: wash archive "p" gnus-article-verify-x-pgp-sig - "d" gnus-article-treat-dumbquotes + "d" gnus-article-treat-smartquotes "U" gnus-article-treat-non-ascii "i" gnus-summary-idna-message) @@ -2509,7 +2509,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs)))) ["Leading space in headers" gnus-article-remove-leading-whitespace t]) ["Overstrike" gnus-article-treat-overstrike t] - ["Dumb quotes" gnus-article-treat-dumbquotes t] + ["Smartquotes" gnus-article-treat-smartquotes t] ["Non-ASCII" gnus-article-treat-non-ascii t] ["Emphasis" gnus-article-emphasize t] ["Word wrap" gnus-article-fill-cited-article t] -- 2.39.2