Merge from emacs--rel--22

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

1 files changed, 26 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0071dc3b220..c683d77ad17 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
+2008-04-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (fill_menu) [TARGET_API_MAC_CARBON]: Use
+        SetMenuItemHierarchicalMenu.
+
+2008-04-05  Jason Rumney  <jasonr@gnu.org>
+
+        * image.c (pbm_load): Allow color values up to 65535.
+        Throw an error if max_color_idx is outside the supported range.
+        Report an error when image size is invalid.
+        Read two bytes at a time when raw images have max_color_idx above 255.
+
+2008-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (readdir): If FindFirstFile/FindNextFile return in
+        cFileName a file name that includes `?' characters, use the 8+3
+        alias in cAlternateFileName instead.
+
+2008-04-05  Kenichi Handa  <handa@ni.aist.go.jp>
+
+        * ccl.c (ccl_driver): If ccl->quit_silently is nonzero, don't
+        append "CCL: Quitted" when the CCL program is quitted.
+        (setup_ccl_program): Initialize ccl->quit_silently to zero.
+
+        * ccl.h (struct ccl_program): New member quit_silently.
+
 2008-04-05  Chong Yidong  <cyd@stupidchicken.com>
 
         * search.c (compile_pattern_1): Treat non-nil and non-string of