Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 887-889)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268

1 files changed, 46 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c928977d68b..4ba46df0f23 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,47 @@
-2007-10-10  Patrick Mahan <mahan@mahan.org>  (tiny change)
+2007-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32term.c (w32_font_is_double_byte, my_create_scrollbar): Make static.
+        (syms_of_w32term) <w32-enable-unicode-output>: Fix typo in docstring.
+
+2007-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (Fmake_indirect_buffer): Set the buffer's tag.
+
+2007-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * eval.c (do_autoload): Don't save autoloads.
+
+        * data.c (Ffset): Save autoload of the function being set.
+
+2007-10-07  John Paul Wallington  <jpw@pobox.com>
+
+        * xfns.c (x_create_tip_frame): Set the `display-type' frame
+        parameter before setting up faces.
+
+2007-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * ccl.c (Fregister_code_conversion_map):
+        * keyboard.c (append_tool_bar_item): Reformat last change.
+
+        * lisp.h (eabs): Rename from `abs'.  All callers changed.
+
+2007-10-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * buffer.c (add_overlay_mod_hooklist):
+        * ccl.c (Fregister_ccl_program, Fregister_code_conversion_map):
+        * fontset.c (make_fontset):
+        * keyboard.c (GROW_RAW_KEYBUF, menu_bar_items, menu_bar_item)
+        (append_tool_bar_item):
+        * macmenu.c (grow_menu_items):
+        * w32menu.c (grow_menu_items):
+        * xmenu.c (grow_menu_items): Use larger_vector.
+
+2007-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (dos_rawgetc): Undo last change (there's no ``leaving
+        selected frame'' on MSDOS).
+
+2007-10-10  Patrick Mahan  <mahan@mahan.org>  (tiny change)
 
         * macfns.c (x_create_tip_frame): Set terminal for frame.
 
@@ -785,7 +828,7 @@
         * keyboard.c (restore_kboard_configuration): Only define when
         MULTI_KBOARD defined.
 
-        * makefile.w32-in: Update dependancies from Makefile.in
+        * makefile.w32-in: Update dependancies from Makefile.in.
         (OBJ1): Add terminal.$(O)
 
         * term.c (dissociate_if_controlling_tty) [WINDOWSNT]:
@@ -1335,7 +1378,7 @@
 
 2007-08-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * mac.c [MAC_OSX] (select_and_poll_event, sys_select): Fix last changes.
+        * mac.c [MAC_OSX] (select_and_poll_event, sys_select): Fix last changes.
 
 2007-08-24  Martin Rudalics  <rudalics@gmx.at>