]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' into xwidget
authorJoakim Verona <joakim@verona.se>
Tue, 23 Dec 2014 16:03:28 +0000 (17:03 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 23 Dec 2014 16:03:28 +0000 (17:03 +0100)
19 files changed:
1  2 
configure.ac
lisp/desktop.el
lisp/progmodes/cc-mode.el
lisp/vc/vc-dir.el
make-dist
nt/INSTALL.OLD
src/.gdbinit
src/Makefile.in
src/buffer.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/keyboard.c
src/lisp.h
src/print.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xterm.c

diff --cc configure.ac
Simple merge
diff --cc lisp/desktop.el
Simple merge
Simple merge
Simple merge
diff --cc make-dist
Simple merge
diff --cc nt/INSTALL.OLD
Simple merge
diff --cc src/.gdbinit
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/buffer.c
Simple merge
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/print.c
Simple merge
diff --cc src/termhooks.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
index 7a00e29a1917c8d3aa20e1cff5983fd27faaedb3,0e3e1a2bb69a5360a40d76f804db7410e00544a0..707418218f010de1a0262292e807f58f5961f062
@@@ -16950,9 -17019,8 +17082,10 @@@ try_window (Lisp_Object window, struct 
  
    /* Initialize iterator and info to start at POS.  */
    start_display (&it, w, pos);
+   it.glyph_row->reversed_p = false;
  
 +
 +  
    /* Display all lines of W.  */
    while (it.current_y < it.last_visible_y)
      {
diff --cc src/xterm.c
Simple merge