diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lisp.mk | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 668bba1e4ed..1fa027b1f5a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-29 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * lisp.mk (lisp): Add electric.elc. | ||
| 4 | |||
| 1 | 2013-11-29 Tom Seddon <emacs@tomseddon.plus.com> (tiny change) | 5 | 2013-11-29 Tom Seddon <emacs@tomseddon.plus.com> (tiny change) |
| 2 | 6 | ||
| 3 | * w32font.c (g_b_init_get_char_width_32_w): New static var. | 7 | * w32font.c (g_b_init_get_char_width_32_w): New static var. |
| @@ -9,6 +13,8 @@ | |||
| 9 | punishing raster (a.k.a. "bitmap") fonts by slowing down | 13 | punishing raster (a.k.a. "bitmap") fonts by slowing down |
| 10 | redisplay. (Bug#6364). | 14 | redisplay. (Bug#6364). |
| 11 | 15 | ||
| 16 | 2013-11-29 Eli Zaretskii <eliz@gnu.org> | ||
| 17 | |||
| 12 | * xdisp.c (clear_mouse_face): Don't invalidate the entire | 18 | * xdisp.c (clear_mouse_face): Don't invalidate the entire |
| 13 | mouse-highlight info, just signal frame_up_to_date_hook that mouse | 19 | mouse-highlight info, just signal frame_up_to_date_hook that mouse |
| 14 | highlight needs to be redisplayed. (Bug#15913) | 20 | highlight needs to be redisplayed. (Bug#15913) |
diff --git a/src/lisp.mk b/src/lisp.mk index c12deebd893..72ada45c5e4 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -164,6 +164,7 @@ lisp = \ | |||
| 164 | $(lispsource)/emacs-lisp/float-sup.elc \ | 164 | $(lispsource)/emacs-lisp/float-sup.elc \ |
| 165 | $(lispsource)/vc/vc-hooks.elc \ | 165 | $(lispsource)/vc/vc-hooks.elc \ |
| 166 | $(lispsource)/vc/ediff-hook.elc \ | 166 | $(lispsource)/vc/ediff-hook.elc \ |
| 167 | $(lispsource)/electric.elc \ | ||
| 167 | $(lispsource)/tooltip.elc | 168 | $(lispsource)/tooltip.elc |
| 168 | 169 | ||
| 169 | 170 | ||