Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru

4 files changed, 29 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d5dff49166..47b0927bbb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2014-07-12  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (display_line): Don't call FETCH_BYTE with argument less
+        than 1.  (Bug#17962)
+
+        * w32fns.c (Fx_file_dialog): Mention in the doc string the
+        behavior on Windows 7 and later when the function is repeatedly
+        invoked with the same value of DIR.  (Bug#17950)
+
+        * xfns.c (Fx_file_dialog) [USE_MOTIF, USE_GTK]: Update the doc
+        string to match the one in w32fns.c.
+
         * minibuf.c (read_minibuf_noninteractive) [WINDOWSNT]: Switch
         stdin to binary mode only if it is connected to a terminal.
 
diff --git a/src/w32fns.c b/src/w32fns.c
index def9d8acb7a..b76c81fdf1f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6394,7 +6394,11 @@ or directory must exist.
 
 This function is only defined on NS, MS Windows, and X Windows with the
 Motif or Gtk toolkits.  With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
+Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+On Windows 7 and later, the file selection dialog "remembers" the last
+directory where the user selected a file, and will open that directory
+instead of DIR on subsequent invocations of this function with the same
+value of DIR as in previous invocations; this is standard Windows behavior.  */)
   (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object only_dir_p)
 {
   /* Filter index: 1: All Files, 2: Directories only  */
diff --git a/src/xdisp.c b/src/xdisp.c
index 6b2fa4be846..b83a2855927 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20494,7 +20494,10 @@ display_line (struct it *it)
           row->truncated_on_right_p = 1;
           it->continuation_lines_width = 0;
           reseat_at_next_visible_line_start (it, 0);
-          row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n';
+          if (IT_BYTEPOS (*it) <= BEG_BYTE)
+            row->ends_at_zv_p = true;
+          else
+            row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n';
           break;
         }
     }
diff --git a/src/xfns.c b/src/xfns.c
index 1ecfadd88b7..08de79596a8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5705,7 +5705,11 @@ or directory must exist.
 
 This function is only defined on NS, MS Windows, and X Windows with the
 Motif or Gtk toolkits.  With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
+Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+On Windows 7 and later, the file selection dialog "remembers" the last
+directory where the user selected a file, and will open that directory
+instead of DIR on subsequent invocations of this function with the same
+value of DIR as in previous invocations; this is standard Windows behavior.  */)
   (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename,
    Lisp_Object mustmatch, Lisp_Object only_dir_p)
 {
@@ -5877,7 +5881,11 @@ or directory must exist.
 
 This function is only defined on NS, MS Windows, and X Windows with the
 Motif or Gtk toolkits.  With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
+Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+On Windows 7 and later, the file selection dialog "remembers" the last
+directory where the user selected a file, and will open that directory
+instead of DIR on subsequent invocations of this function with the same
+value of DIR as in previous invocations; this is standard Windows behavior.  */)
   (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object only_dir_p)
 {
   struct frame *f = SELECTED_FRAME ();