diff options
| author | Stefan Monnier | 2013-06-05 14:10:27 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-06-05 14:10:27 -0400 |
| commit | 55577e7c020702f5bc8c2ff079baf8839fbccb9b (patch) | |
| tree | 19ca8b290af16a0fa1d5e995eb068d03801b62af /src | |
| parent | 8fc57765e8baaf917734997b6bd3ca014613ad65 (diff) | |
| download | emacs-55577e7c020702f5bc8c2ff079baf8839fbccb9b.tar.gz emacs-55577e7c020702f5bc8c2ff079baf8839fbccb9b.zip | |
* lisp/simple.el: Move all the prog-mode code to prog-mode.el.
* lisp/progmodes/prog-mode.el: New file.
* lisp/loadup.el:
* src/lisp.mk (lisp): Add prog-mode.el.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp.mk | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ac0563c6bdd..31e21b04eac 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-05 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * lisp.mk (lisp): Add prog-mode.el. | ||
| 4 | |||
| 1 | 2013-06-05 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-06-05 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Chain glib's SIGCHLD handler from Emacs's (Bug#14474). | 7 | Chain glib's SIGCHLD handler from Emacs's (Bug#14474). |
diff --git a/src/lisp.mk b/src/lisp.mk index 174e53ed561..edd81bcf493 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -129,6 +129,7 @@ lisp = \ | |||
| 129 | $(lispsource)/textmodes/page.elc \ | 129 | $(lispsource)/textmodes/page.elc \ |
| 130 | $(lispsource)/register.elc \ | 130 | $(lispsource)/register.elc \ |
| 131 | $(lispsource)/textmodes/paragraphs.elc \ | 131 | $(lispsource)/textmodes/paragraphs.elc \ |
| 132 | $(lispsource)/progmodes/prog-mode.elc \ | ||
| 132 | $(lispsource)/emacs-lisp/lisp-mode.elc \ | 133 | $(lispsource)/emacs-lisp/lisp-mode.elc \ |
| 133 | $(lispsource)/textmodes/text-mode.elc \ | 134 | $(lispsource)/textmodes/text-mode.elc \ |
| 134 | $(lispsource)/textmodes/fill.elc \ | 135 | $(lispsource)/textmodes/fill.elc \ |