From: Miles Bader <miles@gnu.org>
Date: Thu, 17 May 2007 01:12:58 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~12658
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97b362e7ac1a1bdd3ca1a22cd7328634f88e6247;p=emacs.git

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 18)

   - Update from CVS

2007-05-16  Richard M. Stallman  <rms@gnu.org>

   * lisp/buff-menu.el (Buffer-menu-sort-column): Doc fix.

2007-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/files.el (magic-mode-alist, magic-fallback-mode-alist):
   Move the *ml, Postscript, and XmCD entries to the fallback part.

   * lisp/files.el (magic-fallback-mode-alist):
   Rename from file-start-mode-alist.

2007-05-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

   * src/macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Also convert
   dead key repeat and up events.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-753
---

97b362e7ac1a1bdd3ca1a22cd7328634f88e6247
diff --cc src/ChangeLog
index dc488f6bca7,9bf43195c1d..0be2766fdbe
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
+ 2007-05-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+ 	* macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Also convert
+ 	dead key repeat and up events.
+ 
 +2007-05-14  Chong Yidong  <cyd@stupidchicken.com>
 +
 +	* image.c (pbm_load): Check image size for monochrome pbm.
 +
  2007-05-13  Chong Yidong  <cyd@stupidchicken.com>
  
  	* xterm.c (XTread_socket): Revert last change.