Use default-value rather than default-enable-multibyte-characters.

3 files changed, 18 insertions, 12 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c69d4d8acb8..9d257dd4efb 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 8866befb4f9..0c7a6e3e7b8 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -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 @@ mail with multiple parts is preferred to sending a Unicode one.")
 
 (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 @@ This is a compatibility function for Emacsen without `delete-dups'."
   "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)
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index c0bdec3c025..4ba4bcb5119 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -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 @@ Should be called narrowed to the head of the message."
                 (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 @@ Should be called narrowed to the head of the message."
 ;;;             (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.