Mercurial > emacs
comparison lisp/ChangeLog @ 112229:41f5a96a1e35
ChangeLog merge fixes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 14 Jan 2011 09:42:40 -0800 |
parents | 417b1e4d63cd |
children | f4a73cf7587b |
comparison
equal
deleted
inserted
replaced
112228:417b1e4d63cd | 112229:41f5a96a1e35 |
---|---|
5 | 5 |
6 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> | 6 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> |
7 | 7 |
8 * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628). | 8 * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628). |
9 | 9 |
10 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> | |
11 | |
12 * files.el (file-local-variables-alist): | |
13 Make permanent-local (bug#7767). | |
14 | |
15 2011-01-14 Glenn Morris <rgm@gnu.org> | |
16 | |
17 * version.el (emacs-copyright): Set short copyright year to 2011. | |
18 | |
19 2011-01-14 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change) | |
20 | |
21 * mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering | |
22 an existing temp buffer. (Bug#7746) | |
23 | |
24 2011-01-14 Glenn Morris <rgm@gnu.org> | |
25 | |
26 * mail/mail-utils.el (mail-mbox-from): Handle From: headers with | |
27 multiple addresses. (Bug#7760) | |
28 | |
29 2011-01-14 Michael Albinus <michael.albinus@gmx.de> | |
30 | |
31 * net/tramp.el (tramp-methods): Add recursive options to "scpc", | |
32 "scpx", "pscp" and "psftp". | |
33 | |
34 2011-01-14 Eli Zaretskii <eliz@gnu.org> | |
35 | |
36 * term/w32-win.el (image-library-alist): Set up correctly for | |
37 2011-01-14 Kim F. Storm <storm@cua.dk> | 10 2011-01-14 Kim F. Storm <storm@cua.dk> |
38 | 11 |
39 * emulation/cua-base.el (cua--init-keymaps): | 12 * emulation/cua-base.el (cua--init-keymaps): |
40 Remap exchange-point-and-mark in cua-global-keymap. | 13 Remap exchange-point-and-mark in cua-global-keymap. |
41 | 14 |