diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog.2 | 10 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog.3 | 24 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 8 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mml-sec.el | 68 | ||||
| -rw-r--r-- | lisp/gnus/nndiary.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnmaildir.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnrss.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/spam-stat.el | 2 |
10 files changed, 87 insertions, 39 deletions
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 2f5dd22930e..533ceb84bf1 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -3378,7 +3378,7 @@ * gnus-async.el (gnus-asynchronous): Move defcustom of gnus-asynchronous away from defgroup of gnus-asynchronous. - This seems to fix an intermittant error in which loading gnus-async + This seems to fix an intermittent error in which loading gnus-async fails to define gnus-asynchronous (the variable). * gnus-sum.el: Concur with Steve Young, 5th argument to 'load' is @@ -7096,7 +7096,7 @@ * nnimap.el (nnimap-callback-callback-function): (nnimap-callback-buffer): Remove, these cannot be global but must be embedded into the callback. - (nnimap-make-callback): New. Embedd article number, callback and + (nnimap-make-callback): New. Embed article number, callback and buffer in function. (nnimap-callback, nnimap-request-article-part): Update. @@ -8031,7 +8031,7 @@ (message-xpost-fup2-header, message-xpost-insert-note) (message-xpost-fup2, message-reduce-to-to-cc): New functions adopted from message-utils.el. Add functions to the keymap, mode - describtion and menu. + description and menu. (message-change-subject, message-xpost-fup2): Signal error if current header is empty. (message-xpost-insert-note): Change insert position. @@ -8612,7 +8612,7 @@ 2002-06-11 Simon Josefsson <jas@extundo.com> * gnus-int.el (gnus-request-move-article): Agent expire article if - successfuly moved. + successfully moved. 2002-06-11 Niklas Morberg <niklas.morberg@axis.com> @@ -9073,7 +9073,7 @@ 2002-04-13 Josh Huber <huber@alum.wpi.edu> - * mml-sec.el (mml-secure-message): Change to support arbritrary + * mml-sec.el (mml-secure-message): Change to support arbitrary modes. * mml-sec.el (mml-secure-message-encrypt-(smime|pgp|pgpmime)): changed to support "signencrypt" mode. diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3 index 70eaeb510ac..582c9bd10b7 100644 --- a/lisp/gnus/ChangeLog.3 +++ b/lisp/gnus/ChangeLog.3 @@ -170,7 +170,7 @@ 2015-02-09 Lars Ingebrigtsen <larsi@gnus.org> * mm-decode.el (mm-convert-shr-links): Don't overwrite the faces from - shr, beacause that breaks folding. + shr, because that breaks folding. (mm-shr): Don't shorten the width when using fonts. 2015-02-05 Teodor Zlatanov <tzz@lifelogs.com> @@ -596,7 +596,7 @@ 2014-06-05 Katsumi Yamaoka <yamaoka@jpl.org> - * gnus-art.el (gnus-article-edit-part): Don't modifiy markers. + * gnus-art.el (gnus-article-edit-part): Don't modify markers. (gnus-article-read-summary-keys): Don't bug out when there is no article in the summary buffer. (gnus-mime-buttonize-attachments-in-header): @@ -1318,7 +1318,7 @@ 2013-08-06 Jan Tatarik <jan.tatarik@gmail.com> * gnus-icalendar.el (gnus-icalendar-event-from-ical): Replace pcase - with cond for backwards compatability. + with cond for backwards compatibility. 2013-08-06 Katsumi Yamaoka <yamaoka@jpl.org> @@ -2221,7 +2221,7 @@ 2013-04-04 Katsumi Yamaoka <yamaoka@jpl.org> - * mml.el (mml-minibuffer-read-description): Use `default' insted of + * mml.el (mml-minibuffer-read-description): Use `default' instead of `initial-input' for the argument name. Suggested by Stefan Monnier <monnier@iro.umontreal.ca>. @@ -5541,7 +5541,7 @@ (registry-prune-hard): Use it. * gnus-registry.el (gnus-registry-fixup-registry): Set prune-factor to - 0.1 expicitly. + 0.1 explicitly. 2011-05-13 Glenn Morris <rgm@gnu.org> @@ -8758,7 +8758,7 @@ * shr.el (shr-generic): The text nodes should be text, not :text. - * nnir.el (nnir-search-engine): Ressurect variable, since it's used + * nnir.el (nnir-search-engine): Resurrect variable, since it's used later in the file. 2010-10-30 Andrew Cohen <cohen@andy.bu.edu> @@ -9481,7 +9481,7 @@ nil. * gnus-start.el (gnus-get-unread-articles): Require gnus-agent before - bidning gnus-agent variables. + binding gnus-agent variables. * shr.el (shr-render-td): Use a cache for the table rendering function to avoid getting an exponential rendering behavior in nested tables. @@ -11849,7 +11849,7 @@ 2010-08-13 Teodor Zlatanov <tzz@lifelogs.com> - Doc fixes and keep unknown groups (ammended for nunion bug fix). + Doc fixes and keep unknown groups (amended for nunion bug fix). * gnus-sync.el: Fix docs. (gnus-sync-save): Keep unknown groups in `gnus-sync-newsrc-loader'. @@ -18925,7 +18925,7 @@ * message.el: Autoload gmm-image-load-path. (message-tool-bar-retro): Prepend "gnus/" subdirectory to some icon file names. Use old Emacs 21 "mail_send.xpm" icon for - consitency. + consistency. * gmm-utils.el (gmm-image-load-path): Also search in "../etc/images". Don't set gmm-image-load-path if we don't find @@ -19523,7 +19523,7 @@ * nnml.el: Don't require gnus-bcklg. Autoload it. (nnml-use-compressed-files, nnml-save-mail): Support other - comression programs such as bzip2. + compression programs such as bzip2. 2005-12-17 Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -21227,7 +21227,7 @@ (nntp-with-open-group): Allow debugging. * nnheader.el (mail-header-set-extra): Make into a function - because I just could't understand how to quote the list properly. + because I just couldn't understand how to quote the list properly. * dns.el (query-dns-cached): New function. @@ -24966,7 +24966,7 @@ functions as needing (default), or not needing, gnus-convert-old-newsrc's "backup before upgrading warning". (gnus-convert-converter-needs-prompt): Tests whether the user - should be protected from potentially irreversable changes by the + should be protected from potentially irreversible changes by the function. * legacy-gnus-agent.el: New. Provides converters that are only diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 0e15ebce6c6..684c535f143 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1368,7 +1368,11 @@ CRLF (RFC 5321 SMTP)." ;; input (3.1, 3.3) ;; - if line-length is set, error on input exceeding the limit (3.1) ;; - reject characters outside base encoding (3.3, also section 12) - (let ((splitstr (split-string str "[\n\r \t]+" t))) + ;; + ;; RFC 5322 section 2.2.3 consideration: + ;; Because base 64-encoded strings can appear in long header fields, remove + ;; folding whitespace while still observing the RFC 4648 decisions above. + (let ((splitstr (split-string str "[ \t]*[\r\n]+[ \t]?" t))) (when (and reject-newlines (> (length splitstr) 1)) (error "Invalid Base64 string")) (dolist (substr splitstr) @@ -1424,7 +1428,7 @@ SPEC is a predicate specifier that contains stuff like `or', `and', (autoload 'ido-completing-read "ido") (defun gnus-ido-completing-read (prompt collection &optional require-match initial-input history def) - "Call `ido-completing-read-function'." + "Call `ido-completing-read'." (ido-completing-read prompt collection nil require-match initial-input history def)) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index ef010d6e9c6..77856aeddec 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -5659,7 +5659,7 @@ The result is a fixnum." (mail-file-babyl-p filename)) ;; gnus-output-to-mail does the wrong thing with live, mbox ;; Rmail buffers in Emacs 23. - ;; http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255 + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255 (let ((buff (find-buffer-visiting filename))) (and buff (with-current-buffer buff (eq major-mode 'rmail-mode))))) @@ -8100,7 +8100,7 @@ See `gmm-tool-bar-from-list' for the format of the list." (library image &optional path no-error)) (defun message-make-tool-bar (&optional force) - "Make a message mode tool bar from `message-tool-bar-list'. + "Make a message mode tool bar from `message-tool-bar'. When FORCE, rebuild the tool bar." (when (and (boundp 'tool-bar-mode) tool-bar-mode @@ -8591,7 +8591,7 @@ Meant for use on `completion-at-point-functions'." ;; FIXME: What is the most common term (circular letter, form letter, serial ;; letter, standard letter) for such kind of letter? See also -;; <http://en.wikipedia.org/wiki/Form_letter> +;; <https://en.wikipedia.org/wiki/Form_letter> ;; FIXME: Maybe extent message-mode's font-lock support to recognize ;; `message-form-letter-separator', i.e. highlight each message like a single diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 282465722de..958e24c39f5 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -70,7 +70,7 @@ (mm-coding-system-p 'cp932)) '((windows-31j . cp932))) ;; Charset name: GBK, Charset aliases: CP936, MS936, windows-936 - ;; http://www.iana.org/assignments/charset-reg/GBK + ;; https://www.iana.org/assignments/charset-reg/GBK ;; Emacs 22.1 has cp936, but not gbk, so we alias it: ,@(when (and (not (mm-coding-system-p 'gbk)) (mm-coding-system-p 'cp936)) diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index 69852c381d6..74af99da7e3 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el @@ -938,9 +938,47 @@ If no one is selected, symmetric encryption will be performed. " (signal (car error) (cdr error)))) cipher)) -;; Should probably be removed and the interface should be different. -(defvar mml-secure-allow-signing-with-unknown-recipient nil - "Variable to bind to allow automatic recipient selection.") +(defun mml-secure-sender-sign-query (protocol sender) + "Query whether to use SENDER to sign when using PROTOCOL. +PROTOCOL will be `OpenPGP' or `CMS' (smime). +This can also save the resulting value of +`mml-secure-smime-sign-with-sender' or +`mml-secure-openpgp-sign-with-sender' via Customize. +Returns non-nil if the user has chosen to use SENDER." + (let ((buffer (get-buffer-create "*MML sender signing options*")) + (options '((?a "always" "Sign using this sender now and sign with message sender in future.") + (?s "session only" "Sign using this sender now, and sign with message sender for this session only.") + (?n "no" "Do not sign this message (and error out)"))) + answer done val) + (save-window-excursion + (pop-to-buffer buffer) + (erase-buffer) + (insert (format "No %s signing key was found for this message.\nThe sender of this message is \"%s\".\nWould you like to attempt looking up a signing key based on it?" + (if (eq protocol 'OpenPGP) + "openpgp" "smime") + sender)) + (while (not done) + (setq answer (read-multiple-choice "Sign this message using the sender?" options)) + (cl-case (car answer) + (?a + (if (eq protocol 'OpenPGP) + (progn + (setq mml-secure-openpgp-sign-with-sender t) + (customize-save-variable + 'mml-secure-openpgp-sign-with-sender t)) + (setq mml-secure-smime-sign-with-sender t) + (customize-save-variable 'mml-secure-smime-sign-with-sender t)) + (setq done t + val t)) + (?s + (if (eq protocol 'OpenPGP) + (setq mml-secure-openpgp-sign-with-sender t) + (setq mml-secure-smime-sign-with-sender t)) + (setq done t + val t)) + (?n + (setq done t))))) + val)) (defun mml-secure-epg-sign (protocol mode) ;; Based on code appearing inside mml2015-epg-sign. @@ -950,15 +988,21 @@ If no one is selected, symmetric encryption will be performed. " (signers (mml-secure-signers context signer-names)) signature micalg) (unless signers - (let ((maybe-msg - (if mml-secure-smime-sign-with-sender - "." - "; try setting `mml-secure-smime-sign-with-sender'."))) - ;; If `mml-secure-smime-sign-with-sender' is already non-nil - ;; then there's no point advising the user to examine it. If - ;; there are any other variables worth examining, please - ;; improve this error message by having it mention them. - (unless mml-secure-allow-signing-with-unknown-recipient + (if (and (not noninteractive) + (mml-secure-sender-sign-query protocol sender)) + (setq signer-names (mml-secure-signer-names protocol sender) + signers (mml-secure-signers context signer-names))) + (unless signers + (let ((maybe-msg + (if (or mml-secure-smime-sign-with-sender + mml-secure-openpgp-sign-with-sender) + "." + "; try setting `mml-secure-smime-sign-with-sender' or 'mml-secure-openpgp-sign-with-sender'."))) + ;; If `mml-secure-smime-sign-with-sender' or + ;; `mml-secure-openpgp-sign-with-sender' are already non-nil + ;; then there's no point advising the user to examine them. + ;; If there are any other variables worth examining, please + ;; improve this error message by having it mention them. (error "Couldn't find any signer names%s" maybe-msg)))) (when (eq 'OpenPGP protocol) (setf (epg-context-armor context) t) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index a43eee42ad0..ccd17744993 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -178,7 +178,7 @@ The hook functions will be called with the full group name as argument." (define-obsolete-variable-alias 'nndiary-request-update-info-hooks 'nndiary-request-update-info-functions "24.3") (defcustom nndiary-request-update-info-functions nil - "Hook run after `nndiary-request-update-info-group' is executed. + "Hook run after `nndiary-request-update-info' is executed. The hook functions will be called with the full group name as argument." :group 'nndiary :type 'hook) diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index 81a148db669..68c31dc4510 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -1767,7 +1767,7 @@ This variable is set by `nnmaildir-request-article'.") nnmaildir--cur-server nil) ;; This slightly obscure invocation of `alist-get' removes SERVER from - ;; `nnmaildir-servers'. + ;; `nnmaildir--servers'. (setf (alist-get (nnmaildir--srv-address server) nnmaildir--servers server 'remove #'equal) server)) diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 116d7ee9fb2..48c07da1cc8 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -450,7 +450,7 @@ nnrss: %s: Not valid XML %s and libxml-parse-html-region doesn't work %s" (defun nnrss-normalize-date (date) "Return a date string of DATE in the style of RFC 822 and its successors. This function handles the ISO 8601 date format described in -URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC 822 style +URL `https://www.w3.org/TR/NOTE-datetime', and also the RFC 822 style which RSS 2.0 allows." (let (case-fold-search vector year month day time zone cts given) (cond ((null date)) ; do nothing for this case diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el index 3da45a2b623..bf593865d72 100644 --- a/lisp/gnus/spam-stat.el +++ b/lisp/gnus/spam-stat.el @@ -4,7 +4,7 @@ ;; Author: Alex Schroeder <alex@gnu.org> ;; Keywords: network -;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SpamStat +;; URL: https://www.emacswiki.org/cgi-bin/wiki.pl?SpamStat ;; This file is part of GNU Emacs. |