[gnus git] branch master updated: m0-13-98-g54d52ea =1= Synch with the emacs-25 branch; the changes will be merged to the trunk (soon?)

       via  54d52eadf3f42a9a8f8d972999b823fd229b9bfa (commit)
      from  6aa54ac28a20311bdd9655fbecdcbe4bdcea32c1 (commit)


- Log -----------------------------------------------------------------
commit 54d52eadf3f42a9a8f8d972999b823fd229b9bfa
Author: Katsumi Yamaoka <[email protected]>
Date:   Mon Dec 7 00:28:17 2015 +0000

    Synch with the emacs-25 branch; the changes will be merged to the trunk (soon?)
    
    2015-12-04  Artur Malabarba  <[email protected]>
    
    	* sasl-scram-rfc.el: Add a "Package:" header.
    
    2015-11-17  Paul Eggert  <[email protected]>
    
    	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):

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2eba98..fc261cb 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  <[email protected]>
+
+	* sasl-scram-rfc.el: Add a "Package:" header.
+
 2015-11-25  Katsumi Yamaoka  <[email protected]>
 
 	* nnml.el (nnml-retrieve-groups): Remove.  See:
 	<http://thread.gmane.org/gmane.emacs.gnus.general/86308> and
 	<http://thread.gmane.org/gmane.emacs.gnus.general/86321>
 
+2015-11-17  Paul Eggert  <[email protected]>
+
+	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  <[email protected]>
 
 	* 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 37a5d61..cb95aac 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 7017065..1e57119 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 692bd24..cf7926a 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\" \"[email protected]\")."
+might set this variable to (\"-f\" \"[email protected]\")."
   :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 327b0e6..be56d23 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 ab9145f..24d3a9e 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 193c4e6..bd704f3 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 <[email protected]>
+;; Package: sasl
 
 ;; This file is part of GNU Emacs.
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 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(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project