summaryrefslogtreecommitdiff
path: root/lisp/hl-line.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-07-10 14:52:53 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-07-10 14:52:53 -0400
commit2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch)
tree4837c369ac576fbfd063b1ff046a3daca372f082 /lisp/hl-line.el
parentc971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff)
parent7c33a0572280bdcf0583c5625cfda32f63fad56d (diff)
downloademacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/hl-line.el')
-rw-r--r--lisp/hl-line.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 755ff696453..9a791076002 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -1,12 +1,12 @@
;;; hl-line.el --- highlight the current line
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Maintainer: FSF
;; Created: 1998-09-13
-;; Keywords: faces, frames, emulation
+;; Keywords: faces, frames, emulations
;; This file is part of GNU Emacs.