diff options
| author | Kenichi Handa <handa@m17n.org> | 2011-02-23 10:56:49 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2011-02-23 10:56:49 +0900 |
| commit | 9c02aefc951cca753d1548de717d3b5017e96187 (patch) | |
| tree | b364f2d54248257512be84f7f89b3b42d31d86d1 | |
| parent | 2e15a2cf4ddfbda0bbf972036c11d464f7ba6226 (diff) | |
| parent | e3b300a497971596f3cc6c0f3eb187c903d43dd0 (diff) | |
| download | emacs-9c02aefc951cca753d1548de717d3b5017e96187.tar.gz | |
merge emacs-23
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/notes/bugtracker | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 6 |
4 files changed, 12 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 33b091ba0b9..d0e7b78f2e8 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -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. diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index ca71214cdcc..204948261ba 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd29de7e783..a70330d1022 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/src/ChangeLog b/src/ChangeLog index 26da194f228..addaab34572 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. |