From 54d52eadf3f42a9a8f8d972999b823fd229b9bfa Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 7 Dec 2015 00:28:17 +0000 Subject: [PATCH] Synch with the emacs-25 branch; the changes will be merged to the trunk (soon?) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2015-12-04 Artur Malabarba * sasl-scram-rfc.el: Add a "Package:" header. 2015-11-17 Paul Eggert Fix docstring quoting problems with ‘ '’ Problem reported by Artur Malabarba in: http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html Most of these fixes are to documentation; many involve fixing longstanding quoting glitches that are independent of the recent substitute-command-keys changes. The changes to code are: * gnus-mlspl.el (gnus-group-split-fancy): * hashcash.el (hashcash-extra-generate-parameters): * message.el (message-qmail-inject-args, message-cite-reply-position): * mm-decode.el (mm-inline-large-images): * mm-util.el (mm-xemacs-find-mime-charset-1): --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/gnus-mlspl.el | 4 ++-- lisp/hashcash.el | 2 +- lisp/message.el | 4 ++-- lisp/mm-decode.el | 2 +- lisp/mm-util.el | 2 +- lisp/sasl-scram-rfc.el | 1 + 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2eba9824..fc261cb2c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,12 +3,31 @@ * qp.el (quoted-printable-encode-region): Bind `case-fold-search' to nil when looking for "^From ". Problem reported by Simon Josefsson. +2015-12-04 Artur Malabarba + + * sasl-scram-rfc.el: Add a "Package:" header. + 2015-11-25 Katsumi Yamaoka * nnml.el (nnml-retrieve-groups): Remove. See: and +2015-11-17 Paul Eggert + + Fix docstring quoting problems with ‘ '’ + + Problem reported by Artur Malabarba in: + http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html + Most of these fixes are to documentation; many involve fixing + longstanding quoting glitches that are independent of the + recent substitute-command-keys changes. The changes to code are: + * gnus-mlspl.el (gnus-group-split-fancy): + * hashcash.el (hashcash-extra-generate-parameters): + * message.el (message-qmail-inject-args, message-cite-reply-position): + * mm-decode.el (mm-inline-large-images): + * mm-util.el (mm-xemacs-find-mime-charset-1): + 2015-11-11 Eli Zaretskii * mm-url.el (mm-url-form-encode-xwfu): Allow argument CHUNK to be nil. diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el index 37a5d6150..cb95aac45 100644 --- a/lisp/gnus-mlspl.el +++ b/lisp/gnus-mlspl.el @@ -122,9 +122,9 @@ clauses will be generated. If CATCH-ALL is nil, no catch-all handling is performed, regardless of catch-all marks in group parameters. Otherwise, if there is no selected group whose SPLIT-REGEXP matches the empty string, nor is -there a selected group whose SPLIT-SPEC is 'catch-all, this fancy +there a selected group whose SPLIT-SPEC is `catch-all', this fancy split (say, a group name) will be appended to the returned SPLIT list, -as the last element of a '| SPLIT. +as the last element of a `|' SPLIT. For example, given the following group parameters: diff --git a/lisp/hashcash.el b/lisp/hashcash.el index 70170654f..1e57119f5 100644 --- a/lisp/hashcash.el +++ b/lisp/hashcash.el @@ -97,7 +97,7 @@ If this is not in your PATH, specify an absolute file name." (defcustom hashcash-extra-generate-parameters nil "A list of parameter strings passed to `hashcash-program' when minting. -For example, you may want to set this to '(\"-Z2\") to reduce header length." +For example, you may want to set this to (\"-Z2\") to reduce header length." :type '(repeat string) :group 'hashcash) diff --git a/lisp/message.el b/lisp/message.el index 692bd2455..cf7926a26 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -893,7 +893,7 @@ It may also be a function. For e.g., if you wish to set the envelope sender address so that bounces go to the right place or to deal with listserv's usage of that address, you -might set this variable to '(\"-f\" \"you@some.where\")." +might set this variable to (\"-f\" \"you@some.where\")." :group 'message-sending :link '(custom-manual "(message)Mail Variables") :type '(choice (function) @@ -1158,7 +1158,7 @@ Note: Many newsgroups frown upon nontraditional reply styles. You probably want to set this variable only for specific groups, e.g. using `gnus-posting-styles': - (eval (set (make-local-variable 'message-cite-reply-position) 'above))" + (eval (set (make-local-variable \\='message-cite-reply-position) \\='above))" :version "24.1" :type '(choice (const :tag "Reply inline" traditional) (const :tag "Reply above" above) diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 327b0e6e8..be56d2398 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -393,7 +393,7 @@ enables you to choose manually one of two types those mails include." (defcustom mm-inline-large-images nil "If t, then all images fit in the buffer. -If 'resize, try to resize the images so they fit." +If `resize', try to resize the images so they fit." :type '(radio (const :tag "Inline large images as they are." t) (const :tag "Resize large images." resize) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index ab9145f8b..24d3a9e74 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -1074,7 +1074,7 @@ can be encoded using a single one of the corresponding coding systems. It treats `mm-coding-system-priorities' as the list of preferred coding systems; a useful example setting for this list in Western -Europe would be '(iso-8859-1 iso-8859-15 utf-8), which would default +Europe would be (iso-8859-1 iso-8859-15 utf-8), which would default to the very standard Latin 1 coding system, and only move to coding systems that are less supported as is necessary to encode the characters that exist in the buffer. diff --git a/lisp/sasl-scram-rfc.el b/lisp/sasl-scram-rfc.el index 193c4e6bf..bd704f32e 100644 --- a/lisp/sasl-scram-rfc.el +++ b/lisp/sasl-scram-rfc.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2014-2015 Free Software Foundation, Inc. ;; Author: Magnus Henoch +;; Package: sasl ;; This file is part of GNU Emacs. -- 2.11.4.GIT