| commit | 9792a944dcf08a246bf2618b2a5bee906a888069 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Tue, 3 Mar 2015 22:21:26 +0000 (3 14:21 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Tue, 3 Mar 2015 22:21:26 +0000 (3 14:21 -0800) | ||
| tree | 495e6fbc120a10c383e5572b5e9b879f74cbb71e | treesnapshot (tar.gz zip) |
| parent | 8b990b89011d5b954c794e08549776b15e34fff1 | commitdiff |
| parent | d3852a99c99f0785425a3a4c9d48d31e9aeec7c9 | commitdiff |
Merge from origin/emacs-24
d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.
Conflicts:
admin/ChangeLog
lisp/ChangeLog
d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.
Conflicts:
admin/ChangeLog
lisp/ChangeLog
| admin/ChangeLog | diff1 | diff2 | blobhistory |
| admin/admin.el | diff1 | diff2 | blobhistory |
| lisp/ChangeLog | diff1 | diff2 | blobhistory |
| lisp/progmodes/cc-mode.el | diff1 | diff2 | blobhistory |