diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cfd106aca27..d95e064f164 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-02-13 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-quote-string): Use | ||
| 4 | `shell-quote-argument'. This DTRT even on w32 machines. | ||
| 5 | (ange-ftp-cf1): Quote FILENAME. | ||
| 6 | |||
| 1 | 2008-02-13 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2008-02-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * smerge-mode.el (smerge-auto-combine-max-separation): New var. | 9 | * smerge-mode.el (smerge-auto-combine-max-separation): New var. |