diff options
| author | Jason Rumney | 2001-11-24 16:42:15 +0000 |
|---|---|---|
| committer | Jason Rumney | 2001-11-24 16:42:15 +0000 |
| commit | febf36a1cc2cbb5ab9b9905c7e7f150cd2bab3a6 (patch) | |
| tree | 7b93eb0eb80f4708cdc4846ee81e5060014eb2b0 /lisp/ChangeLog | |
| parent | 24a48c80457807b3d16f5ff61385cd6dc8216f33 (diff) | |
| download | emacs-febf36a1cc2cbb5ab9b9905c7e7f150cd2bab3a6.tar.gz emacs-febf36a1cc2cbb5ab9b9905c7e7f150cd2bab3a6.zip | |
Install entry from 2001-11-20 that had unnoticed conflicts.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2c32bae6850..9301d007acf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -99,6 +99,13 @@ | |||
| 99 | 99 | ||
| 100 | * replace.el (occur-mode): Undo 2001-5-20 change. | 100 | * replace.el (occur-mode): Undo 2001-5-20 change. |
| 101 | 101 | ||
| 102 | 2001-11-20 Jason Rumney <jasonr@gnu.org> | ||
| 103 | |||
| 104 | * w32-fns.el (w32-system-coding-system): Change to an alias for | ||
| 105 | locale-coding-system. | ||
| 106 | (set-w32-system-coding-system): Document the above change. | ||
| 107 | Set locale-coding-system instead. | ||
| 108 | |||
| 102 | 2001-11-20 Richard M. Stallman <rms@gnu.org> | 109 | 2001-11-20 Richard M. Stallman <rms@gnu.org> |
| 103 | 110 | ||
| 104 | * ruler-mode.el: Add pagination. | 111 | * ruler-mode.el: Add pagination. |