merge emacs-23

This commit is contained in:
Kenichi Handa 2011-02-23 10:56:49 +09:00
commit 9c02aefc95
4 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2011-02-22 Juanma Barranquero <lekktu@gmail.com>
* notes/bugtracker (bugtracker_debbugs_url): Fix typo.
2011-01-03 Glenn Morris <rgm@gnu.org>
* admin.el (set-copyright): Also handle \year in refcards/*.tex.

View file

@ -459,7 +459,7 @@ Here "{id}" is a literal string, a placeholder that will be replaced
by the bug number you specify after `--fixes debbugs:' in the bzr
command line (123 in the example above).
In the bazaar.conf file, this setting should go into the [DEFAULTS]
In the bazaar.conf file, this setting should go into the [DEFAULT]
section.
In the locations.conf file, it should go into the branch-specific

View file

@ -1,4 +1,4 @@
2011-02-21 Kenichi Handa <handa@m17n.org>
2011-02-22 Kenichi Handa <handa@m17n.org>
* mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
header components.

View file

@ -1,3 +1,9 @@
2011-02-22 Kenichi Handa <handa@m17n.org>
* font.c (font_open_entity): Be sure to set scaled_pixel_size.
(font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
integer.
2011-02-19 Chong Yidong <cyd@stupidchicken.com>
* Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.