Merge from emacs--devo--0

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 5619ab28143d3bef5061b7ab9d4e599cc2072e51..c94c0d43597c1ead9235f3337b6804c9f3588c2f 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,5 +1,6 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
@@ -168,3 +169,6 @@ extern void cmcostinit ();
 extern void cmgoto ();
 extern void Wcm_clear ();
 extern int Wcm_init ();
+
+/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
+   (do not change this comment) */