Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.

[bpt/emacs.git] / src / ChangeLog.6

diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 6c7d04a..44452aa 100644 (file)
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -2830,7 +2830,7 @@
        * dosfns.c (Fint86, Fdos_memget, Fdos_memput, Fmsdos_set_keyboard):
        Harmonize arguments with documentation.
 
-       * editfns.c (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time,
+       * editfns.c (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time)
        (Finsert_char, Fbuffer_substring, Fbuffer_substring_no_properties)
        (Finsert_buffer_substring, Fdelete_region, Fnarrow_to_region):
        Harmonize arguments with documentation.
@@ -5354,7 +5354,7 @@
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
        Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
@@ -5372,4 +5372,3 @@ See ChangeLog.5 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9