(set_window_buffer): Always preserve current-buffer.

[gnu-emacs] / src / ChangeLog.2

diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 420688ac3856f3efe9d71780c14edfc92add44a7..8165842f6161d6130c1925d53d79065caac1db1c 100644 (file)
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -2683,7 +2683,7 @@
        * emacs.c,  dispnew.c:
        Rename inhibit_x_windows inhibit_window_system.
        Understand "-nw" command-line option.
-       Reorganise init_display a little to make other window-system
+       Reorganize init_display a little to make other window-system
        code easier to accommodate.
 
        * editfns.c (Fformat):
@@ -4772,14 +4772,14 @@
 See ChangeLog.1 for earlier changes.
 
     Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
-       2007  Free Software Foundation, Inc.
+       2007, 2008  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
-  GNU Emacs is free software; you can redistribute it and/or modify
+  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)
-  any later version.
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -4787,8 +4787,6 @@ See ChangeLog.1 for earlier changes.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: 3334fc8a-ec24-4601-99fc-4c8adc2b31bb