Merge from mainline.

diff --combined src/ChangeLog
index 356637b0709817fed836d216100ded4987fbfd98,dea7b2547fd30c5b678145b58414db6926d8399e..cc194f2b21a5a25ef82d6af63d8ed92b6238ab25
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,23 +1,23 @@@
+ 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.
@@@ -487,32 -507,6 +507,32 @@@
        position in the line even if it is not displayed due to
        hscrolling.  (Bug#7939)
  
 +2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Remove no-longer needed getloadavg symbols.
 +      * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
 +      * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
 +      * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
 +      * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
 +      (LDAV_SYMBOL): Remove.
 +      * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
 +      * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
 +
 +      Import getloadavg module from gnulib.
 +      * deps.mk (getloadavg.o): Remove; gnulib now does this.
 +      * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
 +      now does this.
 +      * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
 +      * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
 +      * config.in: Regenerate.
 +
  2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
  
        Port to Sun C 5.11, which has __attribute__ ((__aligned (N))).