Revert last bug-reference-url-format change.

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

diff --git a/lisp/progmodes/cap-words.el b/lisp/progmodes/cap-words.el
index 6854c5e..225c3b8 100644 (file)
--- a/lisp/progmodes/cap-words.el
+++ b/lisp/progmodes/cap-words.el
@@ -1,24 +1,25 @@
 ;;; cap-words.el --- minor mode for motion in CapitalizedWordIdentifiers
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -33,8 +34,8 @@
 
 ;;; Code:
 
-(defun capitalized-next-word-boundary (pos limit)
-  "Function for use in `next-word-boundary-function-table'.
+(defun capitalized-find-word-boundary (pos limit)
+  "Function for use in `find-word-boundary-function-table'.
 Looks for word boundaries before capitals."
   (save-excursion
     (goto-char pos)
@@ -50,15 +51,16 @@ Looks for word boundaries before capitals."
            (re-search-backward "\\<" limit t))))
     (point)))
 
-(defconst capitalized-next-word-boundary-function-table
+
+(defconst capitalized-find-word-boundary-function-table
   (let ((tab (make-char-table nil)))
-    (set-char-table-range tab t #'capitalized-next-word-boundary)
+    (set-char-table-range tab t #'capitalized-find-word-boundary)
     tab)
-  "Assigned to `next-word-boundary-function-table' in Capitalized Words mode.")
+  "Assigned to `find-word-boundary-function-table' in Capitalized Words mode.")
 
 ;;;###autoload
 (define-minor-mode capitalized-words-mode
-  "Toggle 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
@@ -72,23 +74,23 @@ 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.
 
 See also `glasses-mode' and `studlify-word'.
 Obsoletes `c-forward-into-nomenclature'."
   nil " Caps" nil :group 'programming
-  (set (make-local-variable 'next-word-boundary-function-table)
-       capitalized-next-word-boundary-function-table))
+  (set (make-local-variable 'find-word-boundary-function-table)
+       capitalized-find-word-boundary-function-table))
 
 (provide 'cap-words)
 
-;;; arch-tag: 46513b64-fe5a-4c0b-902c-ed235c22975f
+;; arch-tag: 46513b64-fe5a-4c0b-902c-ed235c22975f
 ;;; cap-words.el ends here