Merge from emacs--rel--22

[gnu-emacs] / src / intervals.h

diff --git a/src/intervals.h b/src/intervals.h
index 228c249f41b504670f93976b6caab17bef3e4d05..34254f6069d840a07d243cddf0ebcc26d56ed016 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -4,10 +4,10 @@
 
 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 3, 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
@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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/>.  */
 
 #include "dispextern.h"
 
@@ -269,10 +267,6 @@ extern void delete_interval P_ ((INTERVAL));
 extern INLINE void offset_intervals P_ ((struct buffer *, int, int));
 extern void graft_intervals_into_buffer P_ ((INTERVAL, int, int,
                                             struct buffer *, int));
-extern void set_point P_ ((struct buffer *, int));
-extern INLINE void temp_set_point P_ ((struct buffer *, int));
-extern void set_point_both P_ ((struct buffer *, int, int));
-extern INLINE void temp_set_point_both P_ ((struct buffer *, int, int));
 extern void verify_interval_modification P_ ((struct buffer *, int, int));
 extern INTERVAL balance_intervals P_ ((INTERVAL));
 extern INLINE void copy_intervals_to_string P_ ((Lisp_Object, struct buffer *,