diff options
| author | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
| commit | e3060a0c4d2f418ac786775109d71e5843ccf42e (patch) | |
| tree | 347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08 /src/lisp.mk | |
| parent | 1a3eca0656bdb764200e10a4f264138e94b1f3ce (diff) | |
| parent | 980d78b3587560c13a46aef352ed8d5ed744acf6 (diff) | |
| download | emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.tar.gz emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/lisp.mk')
| -rw-r--r-- | src/lisp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.mk b/src/lisp.mk index 59d5b86c33a..642e9af225f 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -132,6 +132,7 @@ lisp = \ | |||
| 132 | $(lispsource)/textmodes/paragraphs.elc \ | 132 | $(lispsource)/textmodes/paragraphs.elc \ |
| 133 | $(lispsource)/progmodes/prog-mode.elc \ | 133 | $(lispsource)/progmodes/prog-mode.elc \ |
| 134 | $(lispsource)/emacs-lisp/lisp-mode.elc \ | 134 | $(lispsource)/emacs-lisp/lisp-mode.elc \ |
| 135 | $(lispsource)/progmodes/elisp-mode.elc \ | ||
| 135 | $(lispsource)/textmodes/text-mode.elc \ | 136 | $(lispsource)/textmodes/text-mode.elc \ |
| 136 | $(lispsource)/textmodes/fill.elc \ | 137 | $(lispsource)/textmodes/fill.elc \ |
| 137 | $(lispsource)/newcomment.elc \ | 138 | $(lispsource)/newcomment.elc \ |
| @@ -152,7 +153,6 @@ lisp = \ | |||
| 152 | $(lispsource)/term/w32-win.elc \ | 153 | $(lispsource)/term/w32-win.elc \ |
| 153 | $(lispsource)/ls-lisp.elc \ | 154 | $(lispsource)/ls-lisp.elc \ |
| 154 | $(lispsource)/disp-table.elc \ | 155 | $(lispsource)/disp-table.elc \ |
| 155 | $(lispsource)/w32-common-fns.elc \ | ||
| 156 | $(lispsource)/dos-w32.elc \ | 156 | $(lispsource)/dos-w32.elc \ |
| 157 | $(lispsource)/w32-fns.elc \ | 157 | $(lispsource)/w32-fns.elc \ |
| 158 | $(lispsource)/dos-fns.elc \ | 158 | $(lispsource)/dos-fns.elc \ |