Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

4 files changed, 32 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c23585bdab7..6d2ed01bafc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2012-04-14  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-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row
+        "unchanged" if its end.pos is beyond ZV.  (Bug#11199)
+
+2012-04-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (constrainFrameRect): Always constrain when there is only
+        one screen (Bug#10962).
+
 2012-04-13  Ken Brown  <kbrown@cornell.edu>
 
         * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor.
diff --git a/src/lread.c b/src/lread.c
index bfb37b4fc89..50465fd01e8 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -839,7 +839,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
             }
 
           /* Stop scanning if no colon was found before end marker.  */
-          if (!in_file_vars)
+          if (!in_file_vars || ch == '\n' || ch == EOF)
             break;
 
           while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t'))
@@ -863,8 +863,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
                   ch = READCHAR;
                 }
               if (! in_file_vars)
-                /* The value was terminated by an end-marker, which
-                   remove.  */
+                /* The value was terminated by an end-marker, which remove.  */
                 i -= 3;
               while (i > 0 && (val[i - 1] == ' ' || val[i - 1] == '\t'))
                 i--;
diff --git a/src/nsterm.m b/src/nsterm.m
index a45792fd645..7cbaf991311 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6038,11 +6038,15 @@ ns_term_shutdown (int sig)
    restrict the height to just one monitor.  So we override this.  */
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
 {
-  /* When making the frame visible for the first time, we want to
-     constrain.  Other times not.  */
+  /* When making the frame visible for the first time or if there is just
+     one screen, we want to constrain.  Other times not.  */
+  NSUInteger nr_screens = [[NSScreen screens] count];
   struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
   NSTRACE (constrainFrameRect);
 
+  if (nr_screens == 1)
+    return [super constrainFrameRect:frameRect toScreen:screen];
+  
   if (f->output_data.ns->dont_constrain
       || ns_menu_bar_should_be_hidden ())
     return frameRect;
diff --git a/src/xdisp.c b/src/xdisp.c
index c6939a5dcf9..ea964f4dadc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16606,7 +16606,15 @@ find_last_unchanged_at_beg_row (struct window *w)
              continued.  */
           && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos
                && (row->continued_p
-                   || row->exact_window_width_line_p)))
+                   || row->exact_window_width_line_p))
+          /* If ROW->end is beyond ZV, then ROW->end is outdated and
+             needs to be recomputed, so don't consider this row as
+             unchanged.  This happens when the last line was
+             bidi-reordered and was killed immediately before this
+             redisplay cycle.  In that case, ROW->end stores the
+             buffer position of the first visual-order character of
+             the killed text, which is now beyond ZV.  */
+          && CHARPOS (row->end.pos) <= ZV)
         row_found = row;
 
       /* Stop if last visible row.  */