diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 927b3ce86aa..cfd106aca27 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-02-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * smerge-mode.el (smerge-auto-combine-max-separation): New var. | ||
| 4 | (smerge-auto-combine): New fun. | ||
| 5 | |||
| 1 | 2008-02-12 Juri Linkov <juri@jurta.org> | 6 | 2008-02-12 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * startup.el (fancy-startup-screen, normal-splash-screen): | 8 | * startup.el (fancy-startup-screen, normal-splash-screen): |
| @@ -6,8 +11,8 @@ | |||
| 6 | * desktop.el (after-init-hook): Set inhibit-startup-screen to t | 11 | * desktop.el (after-init-hook): Set inhibit-startup-screen to t |
| 7 | after reading the desktop. | 12 | after reading the desktop. |
| 8 | 13 | ||
| 9 | * progmodes/compile.el (compilation-auto-jump): Call | 14 | * progmodes/compile.el (compilation-auto-jump): |
| 10 | compile-goto-error only when compilation-auto-jump-to-first-error | 15 | Call compile-goto-error only when compilation-auto-jump-to-first-error |
| 11 | is non-nil. | 16 | is non-nil. |
| 12 | (compilation-scroll-output): Replace :type 'boolean with a choice | 17 | (compilation-scroll-output): Replace :type 'boolean with a choice |
| 13 | that has three options including a third option `first-error'. | 18 | that has three options including a third option `first-error'. |