2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f24fb9d370c..896af36f060 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 655d08f9884..855a3df2ae3 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -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.")