Merge changes from emacs-23
authorChong Yidong <cyd@stupidchicken.com>
Sun, 24 Oct 2010 21:36:09 +0000 (17:36 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 24 Oct 2010 21:36:09 +0000 (17:36 -0400)
commit0c382083b6b550c26fad8ac7f59b1ba09663e728
tree811262fd6093232799dabb83600551ba63cecaac
parentd77d0953b5ddb05ea7ad19556f37a5f5c4d3a67b
parent23c261f58fceed14e04b3ba928007fde9567d8e2
Merge changes from emacs-23
21 files changed:
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/misc/ChangeLog
doc/misc/gnus.texi
etc/ChangeLog
lisp/ChangeLog
lisp/ChangeLog.12
lisp/ChangeLog.9
lisp/erc/ChangeLog
lisp/erc/erc-backend.el
lisp/face-remap.el
lisp/gnus/ChangeLog.2
lisp/org/ChangeLog
lisp/progmodes/dcl-mode.el
lisp/progmodes/verilog-mode.el
lisp/woman.el
src/ChangeLog
src/atimer.c
src/dispnew.c
src/frame.c
src/xterm.c