Merge from emacs-24 branch

1 files changed, 27 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ae91f04635b..fa6c47bf955 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+2012-04-20  Chong Yidong  <cyd@gnu.org>
+
+        * process.c (wait_reading_process_output): If EIO occurs on a pty,
+        set the status to "failed" and ensure that sentinel is run.
+
+2012-04-20  Glenn Morris  <rgm@gnu.org>
+
+        * process.c (Fset_process_inherit_coding_system_flag)
+        (Fset_process_query_on_exit_flag): Doc fix (mention return value).
+        (Fmake_network_process, Fmake_serial_process): Doc fix.
+
+2012-04-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (string_buffer_position_lim): Limit starting position to
+        BEGV.
+        (set_cursor_from_row): If called for a mode-line or header-line
+        row, return zero immediately.
+        (try_cursor_movement): If inside continuation line, don't back up
+        farther than the first row after the header line, if any.  Don't
+        consider the header-line row as "partially visible", even if
+        MATRIX_ROW_PARTIALLY_VISIBLE_P returns non-zero.  (Bug#11261)
+
+2012-04-20  Atsuo Ohki  <ohki@gssm.otsuka.tsukuba.ac.jp>  (tiny change)
+
+        * lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n" (bug#11238).
+
+2012-04-20  Teodor Zlatanov  <tzz@lifelogs.com>
 2012-04-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)