Merge from emacs-24; up to 117634

3 files changed, 12 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 25009f8a310..89c0bb8fd8e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fexpand_file_name): Use make_unibyte_string, not
+        build_string, when importing a home directory.  (Bug#18873)
+
+        * dispnew.c (buffer_posn_from_coords): Use
+        WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
+        account for the header-line height.  (Bug#18839)
+
 2014-10-28  Ulf Jasper  <ulf.jasper@web.de>
 
         * xml.c (parse_region): Do not forget the first document child.
diff --git a/src/dispnew.c b/src/dispnew.c
index 3ab8bcf3e64..900912d9d97 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5205,7 +5205,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
      start position, i.e. it excludes the header-line row, but
      MATRIX_ROW includes the header-line row.  Adjust for a possible
      header-line row.  */
-  it_vpos = it.vpos + WINDOW_WANTS_MODELINE_P (w);
+  it_vpos = it.vpos + WINDOW_WANTS_HEADER_LINE_P (w);
   if (it_vpos < w->current_matrix->nrows
       && (row = MATRIX_ROW (w->current_matrix, it_vpos),
           row->enabled_p))
diff --git a/src/fileio.c b/src/fileio.c
index 4ba1c5914e8..cdbd0be28ad 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1163,7 +1163,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
               char newdir_utf8[MAX_UTF8_PATH];
 
               filename_from_ansi (newdir, newdir_utf8);
-              tem = build_string (newdir_utf8);
+              tem = make_unibyte_string (newdir_utf8, strlen (newdir_utf8));
             }
           else
 #endif
@@ -1199,7 +1199,7 @@ filesystem tree, not (expand-file-name ".."  dirname).  */)
               /* `getpwnam' may return a unibyte string, which will
                  bite us since we expect the directory to be
                  multibyte.  */
-              tem = build_string (newdir);
+              tem = make_unibyte_string (newdir, strlen (newdir));
               newdirlim = newdir + SBYTES (tem);
               if (multibyte && !STRING_MULTIBYTE (tem))
                 {