Merge from trunkpending

1 files changed, 2 insertions, 4 deletions

diff --git a/src/indent.h b/src/indent.h
index 07ca4dd87a5..c5114b812c8 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -1,5 +1,5 @@
 /* Definitions for interface to indent.c
-   Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1985-1986, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* We introduce new member `tab_offset'.  We need it because of the
    existence of wide-column characters.  There is a case that the
    line-break occurs at a wide-column character and the number of
-   colums of the line gets less than width.
+   columns of the line gets less than width.
 
    Example (where W_ stands for a wide-column character):
              ----------
@@ -73,5 +73,3 @@ int disptab_matches_widthtab (struct Lisp_Char_Table *disptab,
 /* Recompute BUF's width table, using the display table DISPTAB.  */
 void recompute_width_table (struct buffer *buf,
                             struct Lisp_Char_Table *disptab);
-
-