diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/Makefile.in | 6 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c3cab24033..d0eb4efbcc7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2009-11-20 Tassilo Horn <tassilo@member.fsf.org> | 1 | 2009-11-20 Tassilo Horn <tassilo@member.fsf.org> |
| 2 | 2 | ||
| 3 | * makefile.w32-in: Don't refer cc-subword.elc but subword.elc. | ||
| 4 | |||
| 5 | * Makefile.in: Don't refer cc-subword.elc but subword.elc. | ||
| 6 | |||
| 3 | * progmodes/cc-cmds.el (c-update-modeline) | 7 | * progmodes/cc-cmds.el (c-update-modeline) |
| 4 | (c-forward-into-nomenclature, c-backward-into-nomenclature): Refer | 8 | (c-forward-into-nomenclature, c-backward-into-nomenclature): Refer |
| 5 | to subword.el functions instead of cc-subword.el. | 9 | to subword.el functions instead of cc-subword.el. |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index af50e8ef0ee..391a829d3f6 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -1208,7 +1208,6 @@ ELCFILES = \ | |||
| 1208 | $(lisp)/progmodes/cc-menus.elc \ | 1208 | $(lisp)/progmodes/cc-menus.elc \ |
| 1209 | $(lisp)/progmodes/cc-mode.elc \ | 1209 | $(lisp)/progmodes/cc-mode.elc \ |
| 1210 | $(lisp)/progmodes/cc-styles.elc \ | 1210 | $(lisp)/progmodes/cc-styles.elc \ |
| 1211 | $(lisp)/progmodes/cc-subword.elc \ | ||
| 1212 | $(lisp)/progmodes/cc-vars.elc \ | 1211 | $(lisp)/progmodes/cc-vars.elc \ |
| 1213 | $(lisp)/progmodes/cfengine.elc \ | 1212 | $(lisp)/progmodes/cfengine.elc \ |
| 1214 | $(lisp)/progmodes/cmacexp.elc \ | 1213 | $(lisp)/progmodes/cmacexp.elc \ |
| @@ -1309,6 +1308,7 @@ ELCFILES = \ | |||
| 1309 | $(lisp)/startup.elc \ | 1308 | $(lisp)/startup.elc \ |
| 1310 | $(lisp)/strokes.elc \ | 1309 | $(lisp)/strokes.elc \ |
| 1311 | $(lisp)/subr.elc \ | 1310 | $(lisp)/subr.elc \ |
| 1311 | $(lisp)/subword.elc \ | ||
| 1312 | $(lisp)/t-mouse.elc \ | 1312 | $(lisp)/t-mouse.elc \ |
| 1313 | $(lisp)/tabify.elc \ | 1313 | $(lisp)/tabify.elc \ |
| 1314 | $(lisp)/talk.elc \ | 1314 | $(lisp)/talk.elc \ |
| @@ -1657,7 +1657,7 @@ $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\ | |||
| 1657 | $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\ | 1657 | $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\ |
| 1658 | $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\ | 1658 | $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\ |
| 1659 | $(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\ | 1659 | $(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\ |
| 1660 | $(lisp)/progmodes/cc-subword.elc $(lisp)/progmodes/cc-vars.elc: \ | 1660 | $(lisp)/progmodes/cc-vars.elc: \ |
| 1661 | $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc | 1661 | $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc |
| 1662 | 1662 | ||
| 1663 | $(lisp)/progmodes/cc-align.elc: \ | 1663 | $(lisp)/progmodes/cc-align.elc: \ |
| @@ -1691,8 +1691,6 @@ $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \ | |||
| 1691 | $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ | 1691 | $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ |
| 1692 | $(lisp)/progmodes/cc-align.elc | 1692 | $(lisp)/progmodes/cc-align.elc |
| 1693 | 1693 | ||
| 1694 | $(lisp)/progmodes/cc-subword.elc: $(lisp)/progmodes/cc-cmds.elc | ||
| 1695 | |||
| 1696 | $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc | 1694 | $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc |
| 1697 | 1695 | ||
| 1698 | # MH-E dependencies, mainly to prevent failures with parallel | 1696 | # MH-E dependencies, mainly to prevent failures with parallel |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 8c006f25eb3..6b36da51757 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -512,7 +512,7 @@ $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\ | |||
| 512 | $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\ | 512 | $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\ |
| 513 | $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\ | 513 | $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\ |
| 514 | $(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\ | 514 | $(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\ |
| 515 | $(lisp)/progmodes/cc-subword.elc $(lisp)/progmodes/cc-vars.elc: \ | 515 | $(lisp)/progmodes/cc-vars.elc: \ |
| 516 | $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc | 516 | $(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc |
| 517 | 517 | ||
| 518 | $(lisp)/progmodes/cc-align.elc: \ | 518 | $(lisp)/progmodes/cc-align.elc: \ |
| @@ -546,8 +546,6 @@ $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \ | |||
| 546 | $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ | 546 | $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \ |
| 547 | $(lisp)/progmodes/cc-align.elc | 547 | $(lisp)/progmodes/cc-align.elc |
| 548 | 548 | ||
| 549 | $(lisp)/progmodes/cc-subword.elc: $(lisp)/progmodes/cc-cmds.elc | ||
| 550 | |||
| 551 | $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc | 549 | $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc |
| 552 | 550 | ||
| 553 | # MH-E dependencies, mainly to prevent failures with parallel | 551 | # MH-E dependencies, mainly to prevent failures with parallel |