Merge from emacs--devo--0

Patches applied:

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

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

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

   - Update from CVS

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

1 files changed, 26 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bbb44e9cd6d..d8668be9400 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+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
@@ -28711,7 +28736,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,