Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 26 Sep 2013 07:37:16 +0000 (10:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 26 Sep 2013 07:37:16 +0000 (10:37 +0300)
commitb87c4ff2817e71ca71b028792200b1e069a95e04
treebfe00c0655fa02078a9ab2c633ea06d90c4a2064
parentbbc108377873aa6ed7cf21c731770103096eea39
parentba355de014b75ed104da4777f909db70d62f2357
Merge from trunk.
21 files changed:
configure.ac
lisp/faces.el
lisp/mouse.el
src/alloc.c
src/dispextern.h
src/dispnew.c
src/keyboard.c
src/keyboard.h
src/menu.c
src/msdos.c
src/nsmenu.m
src/term.c
src/termchar.h
src/termhooks.h
src/w32console.c
src/w32fns.c
src/w32menu.c
src/w32term.h
src/window.c
src/xdisp.c
src/xmenu.c