Merge from mainline.

6 files changed, 61 insertions, 16 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 356637b0709..cc194f2b21a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,25 @@
 2011-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * process.c (Fstart_process, Fmake_serial_process)
+        (Fmake_network_process, server_accept_connection):
+        Use empty_unibyte_string.
+
+        * alloc.c (make_unibyte_string): Don't SET_UNIBYTE redundantly.
+
+        * lread.c (Qdir_ok): New constant.
+        (syms_of_lread): Initialize it.
+        (openp): Don't ignore directories if the predicate returns dir-ok.
+
+2011-02-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Fix the change made for bug#7939.
+
+        * terminal.c (create_terminal): Use default-keyboard-coding-system
+        and default-terminal-coding-system to initialize coding systems of
+        the new terminal.  (Bug#7840)
+
+2011-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * lisp.h (BYTE_MARK_STACK): New macro.
         (mark_byte_stack): Only declare if BYTE_MARK_STACK is set.
 
diff --git a/src/alloc.c b/src/alloc.c
index e8b8f45e9b1..d7006ca6bfd 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2301,7 +2301,6 @@ make_unibyte_string (const char *contents, EMACS_INT length)
   register Lisp_Object val;
   val = make_uninit_string (length);
   memcpy (SDATA (val), contents, length);
-  STRING_SET_UNIBYTE (val);
   return val;
 }
 
diff --git a/src/lread.c b/src/lread.c
index 7e410fcc334..855869cd90d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1250,7 +1250,9 @@ If SUFFIXES is non-nil, it should be a list of suffixes to append to
 file name when searching.
 If non-nil, PREDICATE is used instead of `file-readable-p'.
 PREDICATE can also be an integer to pass to the access(2) function,
-in which case file-name-handlers are ignored.  */)
+in which case file-name-handlers are ignored.
+This function will normally skip directories, so if you want it to find
+directories, make sure the PREDICATE function returns `dir-ok' for them.  */)
   (Lisp_Object filename, Lisp_Object path, Lisp_Object suffixes, Lisp_Object predicate)
 {
   Lisp_Object file;
@@ -1260,6 +1262,7 @@ in which case file-name-handlers are ignored.  */)
   return file;
 }
 
+static Lisp_Object Qdir_ok;
 
 /* Search for a file whose name is STR, looking in directories
    in the Lisp list PATH, and trying suffixes from SUFFIX.
@@ -1377,9 +1380,12 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
               if (NILP (predicate))
                 exists = !NILP (Ffile_readable_p (string));
               else
-                exists = !NILP (call1 (predicate, string));
-              if (exists && !NILP (Ffile_directory_p (string)))
-                exists = 0;
+                {
+                  Lisp_Object tmp = call1 (predicate, string);
+                  exists = !NILP (tmp)
+                    && (EQ (tmp, Qdir_ok)
+                        || !NILP (Ffile_directory_p (string)));
+                }
 
               if (exists)
                 {
@@ -4377,6 +4383,9 @@ to load.  See also `load-dangerous-libraries'.  */);
   Qfile_truename = intern_c_string ("file-truename");
   staticpro (&Qfile_truename) ;
 
+  Qdir_ok = intern_c_string ("dir-ok");
+  staticpro (&Qdir_ok);
+  
   Qdo_after_load_evaluation = intern_c_string ("do-after-load-evaluation");
   staticpro (&Qdo_after_load_evaluation) ;
 
diff --git a/src/process.c b/src/process.c
index 4a145f7376a..210287a85f1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1660,9 +1660,9 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
   }
 
 
-  XPROCESS (proc)->decoding_buf = make_uninit_string (0);
+  XPROCESS (proc)->decoding_buf = empty_unibyte_string;
   XPROCESS (proc)->decoding_carryover = 0;
-  XPROCESS (proc)->encoding_buf = make_uninit_string (0);
+  XPROCESS (proc)->encoding_buf = empty_unibyte_string;
 
   XPROCESS (proc)->inherit_coding_system_flag
     = !(NILP (buffer) || !inherit_process_coding_system);
@@ -2918,9 +2918,9 @@ usage:  (make-serial-process &rest ARGS)  */)
   p->encode_coding_system = val;
 
   setup_process_coding_systems (proc);
-  p->decoding_buf = make_uninit_string (0);
+  p->decoding_buf = empty_unibyte_string;
   p->decoding_carryover = 0;
-  p->encoding_buf = make_uninit_string (0);
+  p->encoding_buf = empty_unibyte_string;
   p->inherit_coding_system_flag
     = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system);
 
@@ -3787,9 +3787,9 @@ usage: (make-network-process &rest ARGS)  */)
   }
   setup_process_coding_systems (proc);
 
-  p->decoding_buf = make_uninit_string (0);
+  p->decoding_buf = empty_unibyte_string;
   p->decoding_carryover = 0;
-  p->encoding_buf = make_uninit_string (0);
+  p->encoding_buf = empty_unibyte_string;
 
   p->inherit_coding_system_flag
     = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system);
@@ -4364,9 +4364,9 @@ server_accept_connection (Lisp_Object server, int channel)
   p->encode_coding_system = ps->encode_coding_system;
   setup_process_coding_systems (proc);
 
-  p->decoding_buf = make_uninit_string (0);
+  p->decoding_buf = empty_unibyte_string;
   p->decoding_carryover = 0;
-  p->encoding_buf = make_uninit_string (0);
+  p->encoding_buf = empty_unibyte_string;
 
   p->inherit_coding_system_flag
     = (NILP (buffer) ? 0 : ps->inherit_coding_system_flag);
diff --git a/src/terminal.c b/src/terminal.c
index 09c57bc2b0c..309cc0095e8 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -223,6 +223,7 @@ struct terminal *
 create_terminal (void)
 {
   struct terminal *terminal = allocate_terminal ();
+  Lisp_Object terminal_coding, keyboard_coding;
 
   terminal->name = NULL;
   terminal->next_terminal = terminal_list;
@@ -235,8 +236,24 @@ create_terminal (void)
   terminal->terminal_coding =
     (struct coding_system *) xmalloc (sizeof (struct coding_system));
 
-  setup_coding_system (Qno_conversion, terminal->keyboard_coding);
-  setup_coding_system (Qundecided, terminal->terminal_coding);
+  /* If default coding systems for the terminal and the keyboard are
+     already defined, use them in preference to the defaults.  This is
+     needed when Emacs runs in daemon mode.  */
+  keyboard_coding =
+    find_symbol_value (intern ("default-keyboard-coding-system"));
+  if (NILP (keyboard_coding)
+      || EQ (keyboard_coding, Qunbound)
+      || NILP (Fcoding_system_p (keyboard_coding)))
+    keyboard_coding = Qno_conversion;
+  terminal_coding =
+    find_symbol_value (intern ("default-terminal-coding-system"));
+  if (NILP (terminal_coding)
+      || EQ (terminal_coding, Qunbound)
+      || NILP (Fcoding_system_p (terminal_coding)))
+    terminal_coding = Qundecided;
+
+  setup_coding_system (keyboard_coding, terminal->keyboard_coding);
+  setup_coding_system (terminal_coding, terminal->terminal_coding);
 
   terminal->param_alist = Qnil;
   return terminal;
diff --git a/src/xdisp.c b/src/xdisp.c
index 37fd9e4aaab..e144237d34e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17294,7 +17294,7 @@ display_line (struct it *it)
      if the first glyph is partially visible or if we hit a line end.  */
   if (it->current_x < it->first_visible_x)
     {
-      SET_TEXT_POS (this_line_min_pos, ZV + 1, ZV_BYTE + 1);
+      this_line_min_pos = row->start.pos;
       move_it_in_display_line_to (it, ZV, it->first_visible_x,
                                   MOVE_TO_POS | MOVE_TO_X);
       /* Record the smallest positions seen while we moved over