(load-with-code-conversion):

Use third arg to eval-buffer and don't set buffer-file-name.

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 104991bdcf70fe375d93a9c4f2f90f3b183bdf1f..66e82575ec428e51bf7acd4853331c5d3c8b0cac 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -58,13 +58,10 @@ Return t if file exists."
              ;; This is buffer-local.
              (setq enable-multibyte-characters t)
              (insert-file-contents fullname)
-             ;; We must set `buffer-file-name' for `eval-buffer' and
-             ;; `load-history'.
-             (setq buffer-file-name file)
              ;; Make `kill-buffer' quiet.
              (set-buffer-modified-p nil))
            ;; Eval in the original buffer.
-           (eval-buffer buffer))
+           (eval-buffer buffer nil file))
        (let (kill-buffer-hook kill-buffer-query-functions)
          (kill-buffer buffer)))
       (let ((hook (assoc file after-load-alist)))