# HG changeset patch
# User Tassilo Horn <tassilo@member.fsf.org>
# Date 1258914269 0
# Node ID 95389cbb5f733555e04487821bc572bf7c430471
# Parent  234022ddfcd198422ea56f72c2614782e8169bfc
	* progmodes/subword.el (subword-mode-map): Fix subword-mode-map
	generation from word-movement command names.

diff -r 234022ddfcd1 -r 95389cbb5f73 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 22 12:11:00 2009 +0000
+++ b/lisp/ChangeLog	Sun Nov 22 18:24:29 2009 +0000
@@ -1,3 +1,8 @@
+2009-11-22  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* progmodes/subword.el (subword-mode-map): Fix subword-mode-map
+	generation from word-movement command names.
+
 2009-11-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* cedet/semantic/complete.el (semantic-complete-read-tag-engine)
diff -r 234022ddfcd1 -r 95389cbb5f73 lisp/progmodes/subword.el
--- a/lisp/progmodes/subword.el	Sun Nov 22 12:11:00 2009 +0000
+++ b/lisp/progmodes/subword.el	Sun Nov 22 18:24:29 2009 +0000
@@ -86,10 +86,8 @@
 				backward-kill-word transpose-words
                                 capitalize-word upcase-word downcase-word))
       (let ((othercmd (let ((name (symbol-name cmd)))
-                        (string-match "\\(.*-\\)\\(word.*\\)" name)
-                        (intern (concat (match-string 1 name)
-                                        "sub"
-                                        (match-string 2 name))))))
+                        (string-match "\\([[:alpha:]-]+\\)-word[s]?" name)
+                        (intern (concat "subword-" (match-string 1 name))))))
         (define-key map (vector 'remap cmd) othercmd)))
     map)
   "Keymap used in `subword-mode' minor mode.")