]> git.eshelyaron.com Git - emacs.git/commit
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Wed, 17 Nov 2010 16:26:16 +0000 (17:26 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Wed, 17 Nov 2010 16:26:16 +0000 (17:26 +0100)
commit2e274d7de744230b9a8e7a77172afd2621d4760c
tree67e1a64b61cf5f4d8166f4d1ed8de356c15aa8f3
parenta147f96cc79e9eb63696eada341c3f9b87fd3dc3
parentf8d8a97bda1c83380f3f688c4ba0b7fa16320c83
Merge from trunk
lisp/ChangeLog
lisp/electric.el
lisp/gnus/ChangeLog
src/ChangeLog
src/dispnew.c
src/window.c
src/window.h
src/xdisp.c