From 6e329e00f1a7d978e5bde8976d722de5b319b452 Mon Sep 17 00:00:00 2001 From: Emacs developers Date: Wed, 13 Feb 2013 23:19:13 +0000 Subject: [PATCH] Merge changes made in Gnus trunk 2013-02-13 Glenn Morris * message.texi (News Headers): Don't mention yow any more. 2013-02-13 Juri Linkov * gnus-art.el (gnus-article-mode-map): * gnus-sum.el (gnus-summary-mode-map, gnus-summary-article-map): Make S-SPC scroll in the opposite sense to SPC. (Bug#2145) 2013-02-12 Paul Eggert * gnus-group.el (gnus-group-browse-foreign-server): * gnus-start.el (gnus-check-new-newsgroups): * nnmail.el (nnmail-expiry-wait-function, nnmail-read-incoming-hook): * smime.el (smime-crl-check): * emacs-mime.texi (Charset Translation): * gnus-faq.texi (FAQ 5 - Composing messages): * gnus.texi (Group Levels, Exiting the Summary Buffer, Common Variables) (Agent and flags, Score File Format, The problem of spam) (Gnus Registry Setup, Oort Gnus, Terminology) (Optional Back End Functions): * message.texi (Message Buffers): * sieve.texi (Managing Sieve): In doc, use standard American English style for e.g., etc., i.e. --- lisp/ChangeLog | 6 ++++++ lisp/gnus-art.el | 1 + lisp/gnus-group.el | 2 +- lisp/gnus-start.el | 2 +- lisp/gnus-sum.el | 2 ++ lisp/nnmail.el | 4 ++-- lisp/smime.el | 2 +- texi/ChangeLog | 4 ++++ texi/emacs-mime.texi | 2 +- texi/gnus-faq.texi | 2 +- texi/gnus.texi | 22 +++++++++++----------- texi/message.texi | 11 ++++------- texi/sieve.texi | 2 +- 13 files changed, 36 insertions(+), 26 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42437d6e9..6e80bde49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-02-13 Juri Linkov + + * gnus-art.el (gnus-article-mode-map): + * gnus-sum.el (gnus-summary-mode-map, gnus-summary-article-map): + Make S-SPC scroll in the opposite sense to SPC. (Bug#2145) + 2013-02-07 Gábor Vida (tiny change) * auth-source.el (auth-source-format-prompt): Don't get confused by diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 7e642aaa6..b5fbff22d 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -4362,6 +4362,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is (gnus-define-keys gnus-article-mode-map " " gnus-article-goto-next-page + [?\S-\ ] gnus-article-goto-prev-page "\177" gnus-article-goto-prev-page [delete] gnus-article-goto-prev-page [backspace] gnus-article-goto-prev-page diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 7f8cc4788..2643dcd1a 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -4379,7 +4379,7 @@ The hook `gnus-exit-gnus-hook' is called before actually exiting." (defun gnus-group-browse-foreign-server (method) "Browse a foreign news server. If called interactively, this function will ask for a select method - (nntp, nnspool, etc.) and a server address (eg. nntp.some.where). + (nntp, nnspool, etc.) and a server address (e.g., nntp.some.where). If not, METHOD should be a list where the first element is the method and the second element is the address." (interactive diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 9d0e8f7d0..084af8849 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -121,7 +121,7 @@ This variable can be a list of select methods which Gnus will query with the `ask-server' method in addition to the primary, secondary, and archive servers. -Eg. +E.g.: (setq gnus-check-new-newsgroups '((nntp \"some.server\") (nntp \"other.server\"))) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 58dcf4427..70e1dbc63 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1823,6 +1823,7 @@ increase the score of each group you read." (gnus-define-keys gnus-summary-mode-map " " gnus-summary-next-page + [?\S-\ ] gnus-summary-prev-page "\177" gnus-summary-prev-page [delete] gnus-summary-prev-page [backspace] gnus-summary-prev-page @@ -2062,6 +2063,7 @@ increase the score of each group you read." (gnus-define-keys (gnus-summary-article-map "A" gnus-summary-mode-map) " " gnus-summary-next-page "n" gnus-summary-next-page + [?\S-\ ] gnus-summary-prev-page "\177" gnus-summary-prev-page [delete] gnus-summary-prev-page "p" gnus-summary-prev-page diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 85a6d5639..a26656798 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -179,7 +179,7 @@ is to be performed in, and it should return an integer that says how many days an article can be stored before it is considered \"old\". It can also return the values `never' and `immediate'. -Eg.: +E.g.: \(setq nnmail-expiry-wait-function (lambda (newsgroup) @@ -291,7 +291,7 @@ directory. This hook is called after the incoming mail box has been emptied, and can be used to call any mail box programs you have running (\"xwatch\", etc.) -Eg. +E.g.: \(add-hook 'nnmail-read-incoming-hook (lambda () diff --git a/lisp/smime.el b/lisp/smime.el index 7e391c037..2c2775dfb 100644 --- a/lisp/smime.el +++ b/lisp/smime.el @@ -214,7 +214,7 @@ Enabling this will have OpenSSL check the signers certificate against a certificate revocation list (CRL). For this to work the CRL must be up-to-date and since they are -normally updated quite often (ie. several times a day) you +normally updated quite often (i.e., several times a day) you probably need some tool to keep them up-to-date. Unfortunately Gnus cannot do this for you. diff --git a/texi/ChangeLog b/texi/ChangeLog index fdf826f1f..c013b7d64 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Glenn Morris + + * message.texi (News Headers): Don't mention yow any more. + 2013-01-05 Andreas Schwab * auth.texi (VERSION): Set before first use. diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index f91629bbf..f15f3ef76 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -993,7 +993,7 @@ Customization}). The charset to be used can be overridden by setting the @code{charset} @acronym{MML} tag (@pxref{MML Definition}) when composing the message. -The encoding of characters (quoted-printable, 8bit etc) is orthogonal +The encoding of characters (quoted-printable, 8bit, etc.)@: is orthogonal to the discussion here, and is controlled by the variables @code{mm-body-charset-encoding-alist} and @code{mm-content-transfer-encoding-defaults} (@pxref{Encoding diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi index 2a1f5ac2c..e73677300 100644 --- a/texi/gnus-faq.texi +++ b/texi/gnus-faq.texi @@ -1218,7 +1218,7 @@ from using them): messages? * FAQ 5-3:: How to set stuff like From, Organization, Reply-To, signature...? -* FAQ 5-4:: Can I set things like From, Signature etc group based on +* FAQ 5-4:: Can I set things like From, Signature etc. group based on the group I post too? * FAQ 5-5:: Is there a spell-checker? Perhaps even on-the-fly spell-checking? diff --git a/texi/gnus.texi b/texi/gnus.texi index f381dbd7b..c563fe045 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -2348,8 +2348,8 @@ Gnus considers groups from levels 1 to unsubscribed, @code{gnus-level-zombie} to be zombies (walking dead) (default 8) and @code{gnus-level-killed} to be killed (completely dead) (default 9). Gnus treats subscribed and unsubscribed groups exactly the -same, but zombie and killed groups have no information on what articles -you have read, etc, stored. This distinction between dead and living +same, but zombie and killed groups store no information on what articles +you have read, etc. This distinction between dead and living groups isn't done because it is nice or clever, it is done purely for reasons of efficiency. @@ -11140,7 +11140,7 @@ There will never be more than one dead summary buffer at any one time. @vindex gnus-use-cross-reference The data on the current group will be updated (which articles you have -read, which articles you have replied to, etc.) when you exit the +read, which articles you have replied to, etc.)@: when you exit the summary buffer. If the @code{gnus-use-cross-reference} variable is @code{t} (which is the default), articles that are cross-referenced to this group and are marked as read, will also be marked as read in the @@ -14022,7 +14022,7 @@ The address of the @acronym{NNTP} server. Port number to connect to the @acronym{NNTP} server. The default is @samp{nntp}. If you use @acronym{NNTP} over @acronym{TLS}/@acronym{SSL}, you may want to use integer ports rather -than named ports (i.e, use @samp{563} instead of @samp{snews} or +than named ports (i.e., use @samp{563} instead of @samp{snews} or @samp{nntps}), because external @acronym{TLS}/@acronym{SSL} tools may not work with named ports. @@ -19020,7 +19020,7 @@ agent as unread. @subsection Agent and flags The Agent works with any Gnus back end including those, such as -nnimap, that store flags (read, ticked, etc) on the server. Sadly, +nnimap, that store flags (read, ticked, etc.)@: on the server. Sadly, the Agent does not actually know which backends keep their flags in the backend server rather than in @file{.newsrc}. This means that the Agent, while unplugged or disconnected, will always record all changes @@ -19996,7 +19996,7 @@ the article was posted from. Time zones are such wholesome fun for the whole family, eh?) @item Head, Body, All -These three match keys use the same match types as the @code{From} (etc) +These three match keys use the same match types as the @code{From} (etc.)@: header uses. @item Followup @@ -23817,7 +23817,7 @@ from Bulgarian IPs. This, unfortunately, is a great way to discard legitimate e-mail. The risks of blocking a whole country (Bulgaria, Norway, Nigeria, China, -etc.) or even a continent (Asia, Africa, Europe, etc.) from contacting +etc.)@: or even a continent (Asia, Africa, Europe, etc.)@: from contacting you should be obvious, so don't do it if you have the choice. In another instance, the very informative and useful RISKS digest has @@ -25870,7 +25870,7 @@ Fortunately, setting up the Gnus registry is pretty easy: This adds registry saves to Gnus newsrc saves (which happen on exit and when you press @kbd{s} from the @code{*Group*} buffer. It also -adds registry calls to article actions in Gnus (copy, move, etc.) so +adds registry calls to article actions in Gnus (copy, move, etc.)@: so it's not easy to undo the initialization. See @code{gnus-registry-initialize} for the gory details. @@ -27947,7 +27947,7 @@ consist of a little new content at the top with a long, untrimmed message cited below. @item -Smileys (@samp{:-)}, @samp{;-)} etc) are now displayed graphically in +Smileys (@samp{:-)}, @samp{;-)} etc.)@: are now displayed graphically in Emacs too. Put @code{(setq gnus-treat-display-smileys nil)} in @file{~/.gnus.el} to @@ -28553,7 +28553,7 @@ A mail message or news article @item head @cindex head -The top part of a message, where administrative information (etc.) is +The top part of a message, where administrative information (etc.)@: is put. @item body @@ -29502,7 +29502,7 @@ There should be no result data from this function. @item (nnchoke-request-set-mark GROUP ACTION &optional SERVER) Set/remove/add marks on articles. Normally Gnus handles the article -marks (such as read, ticked, expired etc) internally, and store them in +marks (such as read, ticked, expired etc.)@: internally, and store them in @file{~/.newsrc.eld}. Some back ends (such as @acronym{IMAP}) however carry all information about the articles on the server, so Gnus need to propagate the mark information to the server. diff --git a/texi/message.texi b/texi/message.texi index 82641278e..950f6c3ef 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -1817,17 +1817,14 @@ a string nor @code{nil}, use the user name only. However, it is highly unlikely that you should need to fiddle with this variable at all. @end table -@findex yow @cindex Mime-Version In addition, you can enter conses into this list. The @sc{car} of this cons should be a symbol. This symbol's name is the name of the header, and the @sc{cdr} can either be a string to be entered verbatim as the value of this header, or it can be a function to be called. This function should -return a string to be inserted. For instance, if you want to insert -@code{Mime-Version: 1.0}, you should enter @code{(Mime-Version . "1.0")} -into the list. If you want to insert a funny quote, you could enter -something like @code{(X-Yow . yow)} into the list. The function -@code{yow} will then be called without any arguments. +take no arguments, and return a string to be inserted. For +instance, if you want to insert @code{Mime-Version: 1.0}, you should +enter @code{(Mime-Version . "1.0")} into the list. If the list contains a cons where the @sc{car} of the cons is @code{optional}, the @sc{cdr} of this cons will only be inserted if it is @@ -2344,7 +2341,7 @@ Valid values include: @table @code @item nil Generate the buffer name in the Message way (e.g., *mail*, *news*, *mail -to whom*, *news on group*, etc.) and continue editing in the existing +to whom*, *news on group*, etc.)@: and continue editing in the existing buffer of that name. If there is no such buffer, it will be newly created. diff --git a/texi/sieve.texi b/texi/sieve.texi index 11096b270..58db5980a 100644 --- a/texi/sieve.texi +++ b/texi/sieve.texi @@ -159,7 +159,7 @@ press RET on to create a new script. @end example One of the scripts are highlighted, and standard point navigation -commands (@kbd{}, @kbd{} etc) can be used to navigate the +commands (@kbd{}, @kbd{} etc.)@: can be used to navigate the list. The following commands are available in the Manage Sieve buffer: -- 2.25.1