Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d4794667ead..3fabe7579a9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2012-12-27  Glenn Morris  <rgm@gnu.org>
+
+        * cygw32.c (Fcygwin_convert_file_name_to_windows)
+        (Fcygwin_convert_file_name_from_windows): Doc fixes.
+
+2012-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (file_name_as_directory, directory_file_name): Accept
+        an additional argument MULTIBYTE to indicate whether the input C
+        came from a multibyte or a unibyte Lisp string; all callers
+        adjusted.  Don't assume the input string is always multibyte.
+        (Bug#13262)
+        (Ffile_name_directory) [DOS_NT]: Handle unibyte strings correctly:
+        don't ENCODE_FILE them, and return a unibyte string if the input
+        was unibyte.
+        (Fexpand_file_name): Don't mix unibyte with multibyte strings, and
+        don't assume the input strings will always be multibyte.  If the
+        input strings are multibyte, decode strings obtained from C
+        library functions.
+
 2012-12-26  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * lisp.h (toplevel): Add two notices to the comment about