Add default buffer encoding as initial value for buffer.

7k8m · Feb 2, 2019 · 0f914db · 0f914db
1 parent aa70611
commit 0f914db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Buffer.cc b/src/Buffer.cc
@@ -148,7 +148,7 @@ Buffer::Buffer (lisp name, lisp filename, lisp dirname, int temporary)
     n = eol_crlf;
   b_eol_code = eol_code (n);
 
-  lchar_encoding = symbol_value_char_encoding (Vdefault_fileio_encoding);
+  lchar_encoding = symbol_value_char_encoding (Vdefault_buffer_encoding);
 
   b_selection_type = SELECTION_VOID;
   b_selection_point = NO_MARK_SET;

diff --git a/src/ces.cc b/src/ces.cc
@@ -522,8 +522,11 @@ init_char_encoding ()
   xsymbol_value (Qencoding_utf8) = ce;
   xsymbol_value (Vencoding_utf8) = ce;
 
-  xsymbol_value (Vdefault_fileio_encoding) = xsymbol_value (Vencoding_utf8);
+  xsymbol_value (Vdefault_fileio_encoding) = xsymbol_value (Vencoding_sjis);
   xsymbol_value (Vexpected_fileio_encoding) = xsymbol_value (Vencoding_auto);
+
+  xsymbol_value (Vdefault_buffer_encoding) = xsymbol_value(Vencoding_utf8);
+
 }
 
 static lisp

diff --git a/src/gen-syms.cc b/src/gen-syms.cc
@@ -1743,6 +1743,7 @@ static symbols ed[] =
   MAKE_SYMBOL2 (*before-delete-buffer-hook*),
   MAKE_SYMBOL2 (*delete-buffer-hook*),
   MAKE_SYMBOL2 (*default-fileio-encoding*),
+  MAKE_SYMBOL2 (*default-buffer-encoding*),
   MAKE_SYMBOL2 (*expected-fileio-encoding*),
   MAKE_SYMBOL2 (*default-eol-code*),
   MAKE_SYMBOL2 (*expected-eol-code*),