diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/lisp.mk | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a0a31f0bf3c..35b5c1cfe5c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-05 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * lisp.mk (lisp): Add nadvice.elc. | ||
| 4 | |||
| 1 | 2013-08-05 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-08-05 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | New macro to iterate over live buffers similar to frames. | 7 | New macro to iterate over live buffers similar to frames. |
diff --git a/src/frame.c b/src/frame.c index 14fc15c4717..813c97ffe3e 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -710,7 +710,7 @@ affects all frames on the same terminal device. */) | |||
| 710 | type[SBYTES (tty_type)] = 0; | 710 | type[SBYTES (tty_type)] = 0; |
| 711 | } | 711 | } |
| 712 | 712 | ||
| 713 | t = init_tty (name, type, 0); /* Errors are not fatal. */ | 713 | t = init_tty (name, type, 0); /* Errors are not fatal. */ |
| 714 | } | 714 | } |
| 715 | 715 | ||
| 716 | f = make_terminal_frame (t); | 716 | f = make_terminal_frame (t); |
diff --git a/src/lisp.mk b/src/lisp.mk index edd81bcf493..a9a661ea3a8 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -71,6 +71,7 @@ lisp = \ | |||
| 71 | $(lispsource)/faces.elc \ | 71 | $(lispsource)/faces.elc \ |
| 72 | $(lispsource)/button.elc \ | 72 | $(lispsource)/button.elc \ |
| 73 | $(lispsource)/startup.elc \ | 73 | $(lispsource)/startup.elc \ |
| 74 | $(lispsource)/emacs-lisp/nadvice.elc \ | ||
| 74 | $(lispsource)/minibuffer.elc \ | 75 | $(lispsource)/minibuffer.elc \ |
| 75 | $(lispsource)/abbrev.elc \ | 76 | $(lispsource)/abbrev.elc \ |
| 76 | $(lispsource)/simple.elc \ | 77 | $(lispsource)/simple.elc \ |