* lisp/simple.el (completion-list-mode-map): Use choose-completion for the

[bpt/emacs.git] / lisp / progmodes / cap-words.el

diff --git a/lisp/progmodes/cap-words.el b/lisp/progmodes/cap-words.el
index a08880d..b03daf4 100644 (file)
--- a/lisp/progmodes/cap-words.el
+++ b/lisp/progmodes/cap-words.el
@@ -1,7 +1,6 @@
 ;;; cap-words.el --- minor mode for motion in CapitalizedWordIdentifiers
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
@@ -60,10 +59,14 @@ Looks for word boundaries before capitals."
 
 ;;;###autoload
 (define-minor-mode capitalized-words-mode
-  "Toggle Capitalized- Words mode.
-
-In this minor mode, a word boundary occurs immediately before an
-uppercase letter in a symbol.  This is in addition to all the normal
+  "Toggle Capitalized Words mode.
+With a prefix argument ARG, enable Capitalized Words mode if ARG
+is positive, and disable it otherwise.  If called from Lisp,
+enable the mode if ARG is omitted or nil.
+
+Capitalized Words mode is a buffer-local minor mode.  When
+enabled, a word boundary occurs immediately before an uppercase
+letter in a symbol.  This is in addition to all the normal
 boundaries given by the syntax and category tables.  There is no
 restriction to ASCII.
 
@@ -74,13 +77,13 @@ E.g. the beginning of words in the following identifier are as marked:
 
 Note that these word boundaries only apply for word motion and
 marking commands such as \\[forward-word].  This mode does not affect word
-boundaries in found by regexp matching (`\\>', `\\w' &c).
+boundaries found by regexp matching (`\\>', `\\w' &c).
 
 This style of identifiers is common in environments like Java ones,
 where underscores aren't trendy enough.  Capitalization rules are
 sometimes part of the language, e.g. Haskell, which may thus encourage
 such a style.  It is appropriate to add `capitalized-words-mode' to
-the mode hook for programming langauge modes in which you encounter
+the mode hook for programming language modes in which you encounter
 variables like this, e.g. `java-mode-hook'.  It's unlikely to cause
 trouble if such identifiers aren't used.
 
@@ -92,5 +95,4 @@ Obsoletes `c-forward-into-nomenclature'."
 
 (provide 'cap-words)
 
-;; arch-tag: 46513b64-fe5a-4c0b-902c-ed235c22975f
 ;;; cap-words.el ends here