diff options
| author | Stefan Monnier | 2007-11-16 03:16:32 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-11-16 03:16:32 +0000 |
| commit | cc39740b6e28432c3bc4a2b61d04a411ce3b41ed (patch) | |
| tree | fc3161176c404cf3b0ec3ea0a31bc57f69802832 /lisp/ChangeLog | |
| parent | 5580cd5187e2e921575541f7a3a3a84ec517b7ab (diff) | |
| download | emacs-cc39740b6e28432c3bc4a2b61d04a411ce3b41ed.tar.gz emacs-cc39740b6e28432c3bc4a2b61d04a411ce3b41ed.zip | |
(cvs-parse-table): Ignore errors when looking up files
in order to determine if there's a conflict.
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 7ca055fb9cf..86f0e839801 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-11-16 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * pcvs-parse.el (cvs-parse-table): Ignore errors when looking up files | ||
| 4 | in order to determine if there's a conflict. | ||
| 5 | |||
| 1 | 2007-11-16 Juri Linkov <juri@jurta.org> | 6 | 2007-11-16 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * man.el (Man-heading-regexp): Add 0-9. | 8 | * man.el (Man-heading-regexp): Add 0-9. |
| @@ -30,8 +35,8 @@ | |||
| 30 | 35 | ||
| 31 | 2007-11-14 Jason Rumney <jasonr@gnu.org> | 36 | 2007-11-14 Jason Rumney <jasonr@gnu.org> |
| 32 | 37 | ||
| 33 | * international/mule-cmds.el (set-locale-environment): Set | 38 | * international/mule-cmds.el (set-locale-environment): |
| 34 | default-file-name-coding-system from system defaults on Windows. | 39 | Set default-file-name-coding-system from system defaults on Windows. |
| 35 | 40 | ||
| 36 | 2007-11-14 Nick Roberts <nickrob@snap.net.nz> | 41 | 2007-11-14 Nick Roberts <nickrob@snap.net.nz> |
| 37 | 42 | ||