Fri, 14 Jan 2011 13:10:15 -0500 |
Stefan Monnier |
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
|
Fri, 14 Jan 2011 13:06:07 -0500 |
Stefan Monnier |
Update md5 checksums
|
Fri, 14 Jan 2011 09:42:40 -0800 |
Glenn Morris |
ChangeLog merge fixes.
|
Fri, 14 Jan 2011 12:18:41 -0500 |
Stefan Monnier |
Merge from emacs-23
|
Fri, 14 Jan 2011 16:06:17 +0100 |
Kim F. Storm |
* emulation/cua-base.el (cua--init-keymaps):
|
Mon, 03 Jan 2011 21:32:41 +0200 |
Eli Zaretskii |
Don't use png_jmpbuf, it doesn't work with dynamic loading.
|
Sun, 02 Jan 2011 22:21:35 -0800 |
Glenn Morris |
Forgot to mark tiny change.
|
Sun, 02 Jan 2011 22:13:35 -0800 |
Glenn Morris |
Abbrev.el fix for bug #7733. (tiny change)
|
Sun, 02 Jan 2011 22:49:13 -0500 |
Stefan Monnier |
* progmodes/python.el (python-mode): Don't impose font-lock.
|
Sun, 02 Jan 2011 17:14:03 -0800 |
Glenn Morris |
* doc/misc/nxml-mode.texi (Introduction): Fix file name typos.
|
Sun, 02 Jan 2011 16:39:50 -0800 |
Glenn Morris |
Update refcards/*.tex short copyright year to 2011.
|
Sun, 02 Jan 2011 16:35:01 -0800 |
Glenn Morris |
* admin/admin.el (set-copyright): Also handle \year in refcards/*.tex.
|