Mercurial > emacs
comparison lisp/ChangeLog @ 91815:547135392244
*** empty log message ***
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Wed, 13 Feb 2008 17:28:00 +0000 |
parents | ca1e1298a3d8 |
children | 5ec7c3d5aa70 |
comparison
equal
deleted
inserted
replaced
91814:c1e1558393ba | 91815:547135392244 |
---|---|
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. |
4 (smerge-auto-combine): New fun. | 10 (smerge-auto-combine): New fun. |
5 | 11 |