Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd@stupidchicken.com.

[gnu-emacs] / lisp / button.el

diff --git a/lisp/button.el b/lisp/button.el
index 6ef79532ae76238b1167f463cb5174b3931baca5..07c98e668bd3b30ca29706f2e9e5f71291b00a64 100644 (file)
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -1,6 +1,6 @@
 ;;; button.el --- clickable buttons
 ;;
-;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: extensions
@@ -42,7 +42,7 @@
 ;; button face may not be visible.  Using overlays avoids this.
 ;;
 ;; Using `define-button-type' to define default properties for buttons
-;; is not necessary, but it is is encouraged, since doing so makes the
+;; is not necessary, but it is encouraged, since doing so makes the
 ;; resulting code clearer and more efficient.
 ;;