# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1270158802 0
# Node ID d9a02533def5d0c7dca1140f05a9f06517a06e87
# Parent  de35fc0712bc047ebc925a35cd4ec071d76f56e3# Parent  79f81b1664685d5cbf14a8186affda024998115c
Merge from mainline.

diff -r de35fc0712bc -r d9a02533def5 doc/lispref/ChangeLog
--- a/doc/lispref/ChangeLog	Wed Mar 31 21:53:49 2010 +0000
+++ b/doc/lispref/ChangeLog	Thu Apr 01 21:53:22 2010 +0000
@@ -1,3 +1,8 @@
+2010-04-01  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nonascii.texi (Text Representations): Don't mark
+	enable-multibyte-characters as a user option.
+
 2010-03-31  Eli Zaretskii  <eliz@gnu.org>
 
 	* control.texi (Handling Errors): How to re-throw a signal caught
diff -r de35fc0712bc -r d9a02533def5 doc/lispref/nonascii.texi
--- a/doc/lispref/nonascii.texi	Wed Mar 31 21:53:49 2010 +0000
+++ b/doc/lispref/nonascii.texi	Thu Apr 01 21:53:22 2010 +0000
@@ -37,7 +37,7 @@
 
   Emacs buffers and strings support a large repertoire of characters
 from many different scripts, allowing users to type and display text
-in most any known written language.
+in almost any known written language.
 
 @cindex character codepoint
 @cindex codespace
@@ -95,7 +95,7 @@
 The representation for a string is determined and recorded in the string
 when the string is constructed.
 
-@defopt enable-multibyte-characters
+@defvar enable-multibyte-characters
 This variable specifies the current buffer's text representation.
 If it is non-@code{nil}, the buffer contains multibyte text; otherwise,
 it contains unibyte encoded text or binary non-text data.
@@ -105,7 +105,7 @@
 
 The @samp{--unibyte} command line option does its job by setting the
 default value to @code{nil} early in startup.
-@end defopt
+@end defvar
 
 @defun position-bytes position
 Buffer positions are measured in character units.  This function
diff -r de35fc0712bc -r d9a02533def5 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Mar 31 21:53:49 2010 +0000
+++ b/lisp/gnus/ChangeLog	Thu Apr 01 21:53:22 2010 +0000
@@ -1,3 +1,8 @@
+2010-04-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system
+	if set.
+
 2010-03-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag.
diff -r de35fc0712bc -r d9a02533def5 lisp/gnus/mm-uu.el
--- a/lisp/gnus/mm-uu.el	Wed Mar 31 21:53:49 2010 +0000
+++ b/lisp/gnus/mm-uu.el	Thu Apr 01 21:53:22 2010 +0000
@@ -486,9 +486,11 @@
       (if (mm-uu-pgp-signed-test)
 	  (progn
 	    (mml2015-clean-buffer)
-	    (let ((coding-system-for-write (or gnus-newsgroup-charset
+	    (let ((coding-system-for-write (or buffer-file-coding-system
+					       gnus-newsgroup-charset
 					       'iso-8859-1))
-		  (coding-system-for-read (or gnus-newsgroup-charset
+		  (coding-system-for-read (or buffer-file-coding-system
+					      gnus-newsgroup-charset
 					      'iso-8859-1)))
 	      (funcall (mml2015-clear-verify-function))))
 	(when (and mml2015-use (null (mml2015-clear-verify-function)))