3 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad78b4e986c..83ca9ff3a21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-21  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * progmodes/subword.el: Rename from lisp/subword.el.
+
+        * subword.el: Rename to progmodes/subword.el.
+
+        * Makefile.in (ELCFILES): Adapt to subword.el move.
+
 2009-11-21  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 391a829d3f6..63f0144604e 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1264,6 +1264,7 @@ ELCFILES = \
         $(lisp)/progmodes/sh-script.elc \
         $(lisp)/progmodes/simula.elc \
         $(lisp)/progmodes/sql.elc \
+        $(lisp)/progmodes/subword.elc \
         $(lisp)/progmodes/sym-comp.elc \
         $(lisp)/progmodes/tcl.elc \
         $(lisp)/progmodes/vera-mode.elc \
@@ -1308,7 +1309,6 @@ ELCFILES = \
         $(lisp)/startup.elc \
         $(lisp)/strokes.elc \
         $(lisp)/subr.elc \
-        $(lisp)/subword.elc \
         $(lisp)/t-mouse.elc \
         $(lisp)/tabify.elc \
         $(lisp)/talk.elc \
diff --git a/lisp/subword.el b/lisp/progmodes/subword.el
index 655d08f9884..655d08f9884 100644
--- a/lisp/subword.el
+++ b/lisp/progmodes/subword.el