Merge changes from emacs-23 branch

[gnu-emacs] / lisp / term / sup-mouse.el

diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index 52528cb8aa92f49e28b5328141fba6ec1c5b1369..14e50063868e03024694f7996abebdba110a3e42 100644 (file)
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -1,7 +1,7 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
 ;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: FSF
@@ -12,10 +12,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 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
@@ -23,9 +23,7 @@
 ;; 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/>.
 
 ;;; Commentary:
 
@@ -197,5 +195,5 @@ X and Y are 0-based character positions on the frame."
   (get-window-with-predicate (lambda (w)
                               (coordinates-in-window-p (cons x y) w))))
 
-;;; arch-tag: ec644ed4-cac4-43b8-b3db-cfe83e9098d7
+;; arch-tag: ec644ed4-cac4-43b8-b3db-cfe83e9098d7
 ;;; sup-mouse.el ends here