* mh-e/mh-comp.el (mh-send-letter):

* mail/sendmail.el (mail-recover-1):
* international/mule-diag.el (describe-current-coding-system-briefly)
(describe-current-coding-system):
* international/mule-cmds.el (select-safe-coding-system)
(select-message-coding-system)
(set-language-environment-coding-systems, set-locale-environment):
* hexl.el (hexl-insert-multibyte-char):
* dos-w32.el (find-buffer-file-type-coding-system):
* simple.el (what-cursor-position):
Replace uses of default-buffer-file-coding-system
with (default-value 'buffer-file-coding-system).

9 files changed, 61 insertions, 41 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea46d8ebd91..f69a3f287e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,17 @@
 2009-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * mail/sendmail.el (mail-recover-1):
+        * international/mule-diag.el (describe-current-coding-system-briefly)
+        (describe-current-coding-system):
+        * international/mule-cmds.el (select-safe-coding-system)
+        (select-message-coding-system)
+        (set-language-environment-coding-systems, set-locale-environment):
+        * hexl.el (hexl-insert-multibyte-char):
+        * dos-w32.el (find-buffer-file-type-coding-system):
+        * simple.el (what-cursor-position):
+        Replace uses of default-buffer-file-coding-system
+        with (default-value 'buffer-file-coding-system).
+
         * emacs-lisp/edebug.el (edebug-display, edebug-outside-excursion):
         Replace uses of default-cursor-in-non-selected-windows
         with (default-value 'cursor-in-non-selected-windows).
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index a910603f907..9bec5b7a1db 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -102,7 +102,7 @@ and whether the file exists:
     If the match is nil (for dos-text):                 `undecided-dos'
   Otherwise:
     If the file exists:                                 `undecided'
-    If the file does not exist:        default-buffer-file-coding-system
+    If the file does not exist   default value of `buffer-file-coding-system'
 
 Note that the CAR of arguments to `insert-file-contents' operation could
 be a cons cell of the form \(FILENAME . BUFFER\), where BUFFER is a buffer
@@ -169,8 +169,8 @@ set to the appropriate coding system, and the value of
                  (text '(undecided-dos . undecided-dos))
                  (undecided-unix '(undecided-unix . undecided-unix))
                  (undecided '(undecided . undecided))
-                 (t (cons default-buffer-file-coding-system
-                          default-buffer-file-coding-system))))
+                 (t (cons (default-value 'buffer-file-coding-system)
+                          (default-value 'buffer-file-coding-system)))))
           ((eq op 'write-region)
            (if buffer-file-coding-system
                (cons buffer-file-coding-system
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 2cdd449af38..d4aec1484ba 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -795,7 +795,7 @@ and their encoded form is inserted byte by byte."
         (coding (if (or (null buffer-file-coding-system)
                         ;; coding-system-type equals t means undecided.
                         (eq (coding-system-type buffer-file-coding-system) t))
-                    default-buffer-file-coding-system
+                    (default-value 'buffer-file-coding-system)
                   buffer-file-coding-system)))
     (cond ((and (> ch 0) (< ch 256))
            (hexl-insert-char ch num))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 4d4e5c87798..663c5769e35 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -813,7 +813,7 @@ between FROM and TO are shown in a popup window.  Among them, the most
 proper one is suggested as the default.
 
 The list of `buffer-file-coding-system' of the current buffer, the
-`default-buffer-file-coding-system', and the most preferred coding
+default `buffer-file-coding-system', and the most preferred coding
 system (if it corresponds to a MIME charset) is treated as the
 default coding system list.  Among them, the first one that safely
 encodes the text is normally selected silently and returned without
@@ -829,7 +829,7 @@ Optional 3rd arg DEFAULT-CODING-SYSTEM specifies a coding system or a
 list of coding systems to be prepended to the default coding system
 list.  However, if DEFAULT-CODING-SYSTEM is a list and the first
 element is t, the cdr part is used as the default coding system list,
-i.e. `buffer-file-coding-system', `default-buffer-file-coding-system',
+i.e. current `buffer-file-coding-system', default `buffer-file-coding-system',
 and the most preferred coding system are not used.
 
 Optional 4th arg ACCEPT-DEFAULT-P, if non-nil, is a function to
@@ -908,16 +908,18 @@ It is highly recommended to fix it before writing to a file."
 
       (unless (and buffer-file-coding-system-explicit
                    (cdr buffer-file-coding-system-explicit))
-        ;; If default-buffer-file-coding-system is not nil nor undecided,
+        ;; If default buffer-file-coding-system is not nil nor undecided,
         ;; append it to the defaults.
-        (if default-buffer-file-coding-system
-            (let ((base (coding-system-base default-buffer-file-coding-system)))
-              (or (eq base 'undecided)
-                  (rassq base default-coding-system)
-                  (setq default-coding-system
-                        (append default-coding-system
-                                (list (cons default-buffer-file-coding-system
-                                            base)))))))
+        (when (default-value 'buffer-file-coding-system)
+          (let ((base (coding-system-base
+                       (default-value 'buffer-file-coding-system))))
+            (or (eq base 'undecided)
+                (rassq base default-coding-system)
+                (setq default-coding-system
+                      (append default-coding-system
+                              (list (cons (default-value
+                                            'buffer-file-coding-system)
+                                          base)))))))
 
         ;; If the most preferred coding system has the property mime-charset,
         ;; append it to the defaults.
@@ -935,17 +937,18 @@ It is highly recommended to fix it before writing to a file."
         (setq accept-default-p select-safe-coding-system-accept-default-p))
 
     ;; Decide the eol-type from the top of the default codings,
-    ;; buffer-file-coding-system, or
-    ;; default-buffer-file-coding-system.
+    ;; current buffer-file-coding-system, or default buffer-file-coding-system.
     (if default-coding-system
         (let ((default-eol-type (coding-system-eol-type
                                  (caar default-coding-system))))
           (if (and (vectorp default-eol-type) buffer-file-coding-system)
               (setq default-eol-type (coding-system-eol-type
                                       buffer-file-coding-system)))
-          (if (and (vectorp default-eol-type) default-buffer-file-coding-system)
-              (setq default-eol-type (coding-system-eol-type
-                                      default-buffer-file-coding-system)))
+          (if (and (vectorp default-eol-type)
+                   (default-value 'buffer-file-coding-system))
+              (setq default-eol-type
+                    (coding-system-eol-type
+                     (default-value 'buffer-file-coding-system))))
           (if (and default-eol-type (not (vectorp default-eol-type)))
               (dolist (elt default-coding-system)
                 (setcar elt (coding-system-change-eol-conversion
@@ -1032,7 +1035,7 @@ in this order:
   (1) local value of `buffer-file-coding-system'
   (2) value of `sendmail-coding-system'
   (3) value of `default-sendmail-coding-system'
-  (4) value of `default-buffer-file-coding-system'
+  (4) default value of `buffer-file-coding-system'
 If the found coding system can't encode the current buffer,
 or none of them are bound to a coding system,
 it asks the user to select a proper coding system."
@@ -1040,7 +1043,7 @@ it asks the user to select a proper coding system."
                           buffer-file-coding-system)
                      sendmail-coding-system
                      default-sendmail-coding-system
-                     default-buffer-file-coding-system)))
+                     (default-value 'buffer-file-coding-system))))
     (if (eq coding 'no-conversion)
         ;; We should never use no-conversion for outgoing mail.
         (setq coding nil))
@@ -1954,9 +1957,9 @@ See `set-language-info-alist' for use in programs."
   "Do various coding system setups for language environment LANGUAGE-NAME."
   (let* ((priority (get-language-info language-name 'coding-priority))
          (default-coding (car priority))
-         ;; If default-buffer-file-coding-system is nil, don't use
+         ;; If the default buffer-file-coding-system is nil, don't use
          ;; coding-system-eol-type, because it treats nil as
-         ;; `no-conversion'.  default-buffer-file-coding-system is set
+         ;; `no-conversion'.  The default buffer-file-coding-system is set
          ;; to nil by reset-language-environment, and in that case we
          ;; want to have here the native EOL type for each platform.
          ;; FIXME: there should be a common code that runs both on
@@ -1965,13 +1968,12 @@ See `set-language-info-alist' for use in programs."
          ;; which works only as long as the order of loading files at
          ;; dump time and calling functions at startup is not modified
          ;; significantly, i.e. as long as this function is called
-         ;; _after_ default-buffer-file-coding-system was set by
+         ;; _after_ the default buffer-file-coding-system was set by
          ;; dos-w32.el.
          (eol-type
-          (if (null default-buffer-file-coding-system)
-              (cond ((memq system-type '(windows-nt ms-dos)) 1)
-                    (t 0))
-            (coding-system-eol-type default-buffer-file-coding-system))))
+          (coding-system-eol-type
+           (or (default-value 'buffer-file-coding-system)
+               (if (memq system-type '(windows-nt ms-dos)) 'dos 'unix)))))
     (when priority
       (set-default-coding-systems
        (if (memq eol-type '(0 1 2 unix dos mac))
@@ -2564,7 +2566,7 @@ See also `locale-charset-language-names', `locale-language-names',
             (charset-language-name
              (locale-name-match locale locale-charset-language-names))
             (default-eol-type (coding-system-eol-type
-                               default-buffer-file-coding-system))
+                               (default-value 'buffer-file-coding-system)))
             (coding-system
              (or (locale-name-match locale locale-preferred-coding-systems)
                  (when locale
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 89daaae7063..1550443ddd3 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -516,8 +516,8 @@ in place of `..':
   eol-type of `process-coding-system' for read (of the current buffer, if any)
   `process-coding-system' for write (of the current buffer, if any)
   eol-type of `process-coding-system' for write (of the current buffer, if any)
-  `default-buffer-file-coding-system'
-  eol-type of `default-buffer-file-coding-system'
+  default `buffer-file-coding-system'
+  eol-type of default `buffer-file-coding-system'
   `default-process-coding-system' for read
   eol-type of `default-process-coding-system' for read
   `default-process-coding-system' for write
@@ -537,8 +537,9 @@ in place of `..':
      (coding-system-eol-type-mnemonic (car process-coding-systems))
      (coding-system-mnemonic (cdr process-coding-systems))
      (coding-system-eol-type-mnemonic (cdr process-coding-systems))
-     (coding-system-mnemonic default-buffer-file-coding-system)
-     (coding-system-eol-type-mnemonic default-buffer-file-coding-system)
+     (coding-system-mnemonic (default-value 'buffer-file-coding-system))
+     (coding-system-eol-type-mnemonic
+      (default-value 'buffer-file-coding-system))
      (coding-system-mnemonic (car default-process-coding-system))
      (coding-system-eol-type-mnemonic (car default-process-coding-system))
      (coding-system-mnemonic (cdr default-process-coding-system))
@@ -592,7 +593,7 @@ docstring, and print only the first line of the docstring."
           (print-coding-system-briefly buffer-file-coding-system)
         (princ "Not set locally, use the default.\n"))
       (princ "Default coding system (for new files):\n  ")
-      (print-coding-system-briefly default-buffer-file-coding-system)
+      (print-coding-system-briefly (default-value 'buffer-file-coding-system))
       (princ "Coding system for keyboard input:\n  ")
       (print-coding-system-briefly (keyboard-coding-system))
       (princ "Coding system for terminal output:\n  ")
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 09028a37628..58f52aa68f4 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -931,7 +931,7 @@ This function uses `mail-envelope-from'."
 ;;;###autoload
 (defvar sendmail-coding-system nil
   "*Coding system for encoding the outgoing mail.
-This has higher priority than `default-buffer-file-coding-system'
+This has higher priority than the default `buffer-file-coding-system'
 and `default-sendmail-coding-system',
 but lower priority than the local value of `buffer-file-coding-system'.
 See also the function `select-message-coding-system'.")
@@ -1509,7 +1509,7 @@ and don't delete any header fields."
             (insert-buffer original)
             ;; If they yank the original text, the encoding of the
             ;; original message is a better default than
-            ;; default-buffer-file-coding-system.
+            ;; the default buffer-file-coding-system.
             (and (coding-system-equal
                   (default-value 'buffer-file-coding-system)
                   buffer-file-coding-system)
@@ -1855,7 +1855,7 @@ The seventh argument ACTIONS is a list of actions to take
               ;; TRT, or the user will get prompted for the right
               ;; encoding when they send the message.
               (setq buffer-file-coding-system
-                    default-buffer-file-coding-system))))))))
+                    (default-value 'buffer-file-coding-system)))))))))
 
 (declare-function dired-move-to-filename "dired" (&optional raise-error eol))
 (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 9ca26b3e943..585cc0a86c6 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mh-comp.el (mh-send-letter): default-buffer-file-coding-system
+        => (default-value 'buffer-file-coding-system).
+
 2009-08-10  Bill Wohler  <wohler@newt.com>
 
         * mh-junk.el (mh-spamassassin-blacklist, mh-bogofilter-blacklist)
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 43a1a482cca..5ae78ef1767 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -276,8 +276,8 @@ message and scan line."
                              '(undecided undecided-unix undecided-dos))))
              buffer-file-coding-system
            (or (and (boundp 'sendmail-coding-system) sendmail-coding-system)
-               (and (boundp 'default-buffer-file-coding-system )
-                    default-buffer-file-coding-system)
+               (and (default-boundp 'buffer-file-coding-system)
+                    (default-value 'buffer-file-coding-system))
                'iso-latin-1))))
     ;; Older versions of spost do not support -msgid and -mime.
     (unless mh-send-uses-spost-flag
diff --git a/lisp/simple.el b/lisp/simple.el
index f2926401213..6ec2e92dac2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -999,7 +999,7 @@ in *Help* buffer.  See also the command `describe-char'."
             encoded encoding-msg display-prop under-display)
         (if (or (not coding)
                 (eq (coding-system-type coding) t))
-            (setq coding default-buffer-file-coding-system))
+            (setq coding (default-value 'buffer-file-coding-system)))
         (if (eq (char-charset char) 'eight-bit)
             (setq encoding-msg
                   (format "(%d, #o%o, #x%x, raw-byte)" char char char))