diff options
| author | Chong Yidong | 2008-09-25 01:44:10 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-09-25 01:44:10 +0000 |
| commit | 51dde7dc8a96079be86f92ed1d2f18f562d49b41 (patch) | |
| tree | 4e1728957e5a7a61c2de4b891c79ad380c354280 | |
| parent | 64a0823127d130166cf41df4d601cd37161a5768 (diff) | |
| download | emacs-51dde7dc8a96079be86f92ed1d2f18f562d49b41.tar.gz emacs-51dde7dc8a96079be86f92ed1d2f18f562d49b41.zip | |
* vc.el (vc-mark-resolved): Move message here from vc-default-mark-resolved.
(vc-default-mark-resolved): Change to an alias for ignore.
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4abcf07dcd8..a9159efe5e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-09-25 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * vc.el (vc-mark-resolved): Move message here from | ||
| 4 | vc-default-mark-resolved. | ||
| 5 | (vc-default-mark-resolved): Change to an alias for ignore. | ||
| 6 | |||
| 1 | 2008-09-24 Andreas Politz <politza@fh-trier.de> (tiny change) | 7 | 2008-09-24 Andreas Politz <politza@fh-trier.de> (tiny change) |
| 2 | 8 | ||
| 3 | * term.el (term-emulate-terminal): Encode input string before | 9 | * term.el (term-emulate-terminal): Encode input string before |