1 files changed, 7 insertions, 0 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index f9b2c2633d1..ef609e0f798 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -698,6 +698,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
   (set-locale-environment nil)
 
+  ;; Convert the arguments to Emacs internal representation.
+  (let ((args (cdr command-line-args)))
+    (while args
+      (setcar args
+              (decode-coding-string (car args) locale-coding-system t))
+      (setq args (cdr args))))
+
   (let ((done nil)
         (args (cdr command-line-args)))