Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.
authorGlenn Morris <rgm@gnu.org>
Sat, 5 Feb 2011 22:30:14 +0000 (14:30 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 5 Feb 2011 22:30:14 +0000 (14:30 -0800)
commit233ba4d924933cb56129bd7511e6137b7c0b8e3e
tree741044a058b02f007a55e1fdbe8ac480feba0ada
parent827b77e90f4f3a86abfc82a07a8319f5f4cfb3d3
parenta60287ff994ec4d07779128f0df5500bed1b3cf9
Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.
19 files changed:
doc/emacs/ChangeLog
doc/emacs/custom.texi
doc/emacs/maintaining.texi
doc/emacs/rmail.texi
doc/lispref/ChangeLog
doc/lispref/commands.texi
etc/NEWS.23
lisp/ChangeLog
lisp/calendar/diary-lib.el
lisp/emacs-lisp/cl-macs.el
lisp/faces.el
lisp/ibuf-ext.el
lisp/progmodes/f90.el
src/ChangeLog
src/editfns.c
src/ftfont.c
src/window.c
src/xfaces.c
src/xftfont.c