Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28

1 files changed, 68 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ac6b24aaffa..b8054295979 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,70 @@
+2007-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * puresize.h (BASE_PURESIZE): Increase to 1130000.
+
+2007-07-30  Richard Stallman  <rms@gnu.org>
+
+        * lread.c (readevalloop, read1): Treat NBSP as whitespace.
+
+2007-07-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gmalloc.c (__malloc_initialize): Remove pthread_once.  Not needed.
+
+2007-07-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for
+        remote default-directory.
+
+        * buffer.c (mode-line-format): Update doc string.
+
+2007-07-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * w32term.c (w32_draw_fringe_bitmap): Extend fringe background to
+        scroll bar gap.
+        (x_scroll_bar_create): Set bar->fringe_extended_p.
+        (w32_set_vertical_scroll_bar): Put leftmost/rightmost scroll bars
+        on frame edge.  Check fringe background extension.  Don't clear
+        extended fringe background area.
+
+        * w32term.h (struct scroll_bar): New member fringe_extended_p.
+        (w32_fill_area): Enclose multiple statements with do ... while (0).
+
+        * xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]:
+        Extend fringe background to scroll bar gap.
+        (x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]:
+        Set bar->fringe_extended_p.
+        (XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        Put leftmost/rightmost scroll bars on frame edge.  Check fringe
+        background extension.  Don't clear extended fringe background area.
+
+        * xterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        New member fringe_extended_p.
+
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * Relicense all FSF files to GPLv3 or later.
+
+        * COPYING: Switch to GPLv3.
+
+2007-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Fcommandp): Pay attention to the `interactive-form' property.
+
+        * data.c (Finteractive_form): Check for the presence of an
+        `interactive-form' symbol property more thoroughly.
+
+        * data.c (Finteractive_form): Use an `interactive-form' property if
+        present, analogous to the function-documentation property.
+
+2007-07-24  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (x_real_positions): Get real position from OS instead of
+        calculating it.
+
+2007-07-23  Jason Rumney  <jasonr@gnu.org>
+
+        * filelock.c (current_lock_owner): Allow for @ sign in username.
+
 2007-07-22  Nick Roberts  <nickrob@snap.net.nz>
 
         * xdisp.c (decode_mode_spec): Add case 'R' for to test for
@@ -28716,7 +28783,7 @@ See ChangeLog.9 for earlier changes.
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,