Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

[bpt/emacs.git] / lisp / vcursor.el

diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 2009eb9..d4fc359 100644 (file)
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -1,7 +1,6 @@
 ;;; vcursor.el --- manipulate an alternative ("virtual") cursor
 
-;; Copyright (C) 1994, 1996, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1998, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
 ;; Maintainer: FSF
@@ -30,7 +29,7 @@
 ;; - *IMPORTANT* vcursor-key-bindings is now nil by default, to avoid
 ;;   side-effects when the package is loaded.  This means no keys are
 ;;   bound by default.  Use customize to change it to t to restore
-;;   the old behaviour.  (If you do it by hand in .emacs, it
+;;   the old behavior.  (If you do it by hand in .emacs, it
 ;;   must come before vcursor is loaded.)
 ;; - You can alter the main variables and the vcursor face via
 ;;   M-x customize: go to the Editing group and find Vcursor.
@@ -52,7 +51,7 @@
 ;; Virtual cursor commands.  I got this idea from the old BBC micro.
 ;; You need Emacs 19 or 20 and a window system for the best effects.
 ;; For character terminals, at least Emacs 19.29 is required
-;; (special behaviour for the overlay property
+;; (special behavior for the overlay property
 ;; "before-string" must be implemented).  Search for "dumb terminals"
 ;; for more information.
 ;;
@@ -104,7 +103,7 @@
 ;; In the "on" state, moving the virtual cursor will copy the
 ;; moved-over text to the normal cursor position (including when going
 ;; backwards, though each piece of text moved over is copied forwards:
-;; compare the behaviour of C-S-up and C-S-left).
+;; compare the behavior of C-S-up and C-S-left).
 ;;
 ;; However, that's just a small part of the magic.  If the virtual
 ;; cursor goes off the display, it will be redisplayed in some other
@@ -325,7 +324,7 @@
 (defgroup vcursor nil
   "Manipulate an alternative (\"virtual\") cursor."
   :prefix "vcursor-"
-  :group 'editing)
+  :group 'convenience)
 
 (defface vcursor
   '((((class color)) (:foreground "blue" :background "cyan" :underline t))
@@ -1144,5 +1143,4 @@ line is treated like ordinary characters."
 
 (provide 'vcursor)
 
-;; arch-tag: cdfe1cdc-2c46-4046-88e4-ed57d20f7aca
 ;;; vcursor.el ends here