changeset 104830:79c2323377ac

Use default-value rather than default-enable-multibyte-characters.
author Glenn Morris <rgm@gnu.org>
date Thu, 03 Sep 2009 07:26:31 +0000
parents b06b66cffb2d
children b3b333f43d85
files lisp/gnus/ChangeLog lisp/gnus/mm-util.el lisp/gnus/rfc2047.el
diffstat 3 files changed, 18 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Sep 03 07:20:50 2009 +0000
+++ b/lisp/gnus/ChangeLog	Thu Sep 03 07:26:31 2009 +0000
@@ -1,3 +1,9 @@
+2009-09-03  Glenn Morris  <rgm@gnu.org>
+
+	* mm-util.el (mm-emacs-mule, mm-default-multibyte-p):
+	* rfc2047.el (rfc2047-encode-message-header): Use default-value rather
+	than default-enable-multibyte-characters.
+
 2009-09-02  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-util.el (gnus-float-time): New function.
--- a/lisp/gnus/mm-util.el	Thu Sep 03 07:20:50 2009 +0000
+++ b/lisp/gnus/mm-util.el	Thu Sep 03 07:26:31 2009 +0000
@@ -1,7 +1,7 @@
 ;;; mm-util.el --- Utility functions for Mule and low level things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -900,8 +900,8 @@
 
 (eval-and-compile
   (defvar mm-emacs-mule (and (not (featurep 'xemacs))
-			     (boundp 'default-enable-multibyte-characters)
-			     default-enable-multibyte-characters
+			     (boundp 'enable-multibyte-characters)
+			     (default-value 'enable-multibyte-characters)
 			     (fboundp 'set-buffer-multibyte))
     "True in Emacs with Mule.")
 
@@ -1013,8 +1013,8 @@
   "Return non-nil if the session is multibyte.
 This affects whether coding conversion should be attempted generally."
   (if (featurep 'mule)
-      (if (boundp 'default-enable-multibyte-characters)
-	  default-enable-multibyte-characters
+      (if (boundp 'enable-multibyte-characters)
+	  (default-value 'enable-multibyte-characters)
 	t)))
 
 (defun mm-iso-8859-x-to-15-region (&optional b e)
--- a/lisp/gnus/rfc2047.el	Thu Sep 03 07:20:50 2009 +0000
+++ b/lisp/gnus/rfc2047.el	Thu Sep 03 07:26:31 2009 +0000
@@ -1,7 +1,7 @@
 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -282,8 +282,8 @@
 		(rfc2047-encode-region (point) (point-max))))
 	     ((eq method 'default)
 	      (if (and (featurep 'mule)
-		       (if (boundp 'default-enable-multibyte-characters)
-			   default-enable-multibyte-characters)
+		       (if (boundp 'enable-multibyte-characters)
+			   (default-value 'enable-multibyte-characters))
 		       mail-parse-charset)
 		  (mm-encode-coding-region (point) (point-max)
 					   mail-parse-charset)))
@@ -309,8 +309,8 @@
 ;;; 		(error "Cannot send unencoded text")))
 	     ((mm-coding-system-p method)
 	      (if (or (and (featurep 'mule)
-			   (if (boundp 'default-enable-multibyte-characters)
-			       default-enable-multibyte-characters))
+			   (if (boundp 'enable-multibyte-characters)
+			       (default-value 'enable-multibyte-characters)))
 		      (featurep 'file-coding))
 		  (mm-encode-coding-region (point) (point-max) method)))
 	     ;; Hm.