* src/macfont.m (mac_font_shape): Make sure that total_advance is increasing.

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 829abc083f711b25348f4cc3402170ade35a9bf1..126969dcce26ad5ab6b3c00475c699488a744202 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,12 +1,12 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 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 of the License, 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
@@ -16,6 +16,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef EMACS_CM_H
+#define EMACS_CM_H
+
 /* Holds the minimum and maximum costs for the parameterized capabilities.  */
 struct parmcap
   {
@@ -166,3 +169,5 @@ extern void cmcostinit (struct tty_display_info *);
 extern void cmgoto (struct tty_display_info *, int, int);
 extern void Wcm_clear (struct tty_display_info *);
 extern int Wcm_init (struct tty_display_info *);
+
+#endif /* EMACS_CM_H */