Merge from emacs-23
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 13 Dec 2010 15:27:36 +0000 (10:27 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 13 Dec 2010 15:27:36 +0000 (10:27 -0500)
commitf49d1f52b2e368ef67dcfececd426de958548f4e
treece24ced92f2acc976daf4b69e3634c8bd600e44e
parent07176b2a9e63a0d3933b167f987475d8a18da5cc
parent11aad4e9f9f54ce8e9ecc66347e512b20a3cdf39
Merge from emacs-23
45 files changed:
doc/emacs/ChangeLog
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/msdog.texi
doc/emacs/search.texi
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/modes.texi
doc/lispref/processes.texi
doc/lispref/text.texi
doc/misc/ChangeLog
doc/misc/cl.texi
etc/ChangeLog
etc/schema/schemas.xml
lisp/ChangeLog
lisp/calendar/diary-lib.el
lisp/comint.el
lisp/cus-edit.el
lisp/dired-aux.el
lisp/dired.el
lisp/files.el
lisp/format.el
lisp/frame.el
lisp/ido.el
lisp/image-dired.el
lisp/mail/rmail.el
lisp/mail/rmailmm.el
lisp/mouse.el
lisp/net/tramp-sh.el
lisp/net/tramp.el
lisp/ps-print.el
lisp/subr.el
lisp/url/ChangeLog
lisp/url/url-cookie.el
lisp/vc/diff-mode.el
lisp/vc/log-edit.el
src/ChangeLog
src/buffer.c
src/config.in
src/dispextern.h
src/fileio.c
src/keyboard.c
src/nsterm.m
src/xdisp.c
src/xsmfns.c