Mercurial > emacs
comparison lisp/ChangeLog @ 46515:272c43ada087
Remove conflict marker.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 18 Jul 2002 09:42:56 +0000 |
parents | 22964382b73a |
children | 16bfc5cf92da |
comparison
equal
deleted
inserted
replaced
46514:22964382b73a | 46515:272c43ada087 |
---|---|
81 (define-ccl-program): Doc update. | 81 (define-ccl-program): Doc update. |
82 | 82 |
83 * international/utf-8-subst.el: Populate utf-8-subst-rev-table. | 83 * international/utf-8-subst.el: Populate utf-8-subst-rev-table. |
84 (utf-8-subst-table): Don't set. | 84 (utf-8-subst-table): Don't set. |
85 | 85 |
86 >>>>>>> 1.4125 | |
87 2002-07-17 Kenichi Handa <handa@etl.go.jp> | 86 2002-07-17 Kenichi Handa <handa@etl.go.jp> |
88 | 87 |
89 * international/mule.el (define-coding-system-alias): | 88 * international/mule.el (define-coding-system-alias): |
90 Don't append ALIAS in the property `alias-coding-systems' if ALIAS's | 89 Don't append ALIAS in the property `alias-coding-systems' if ALIAS's |
91 eol-type is not auto-detection. | 90 eol-type is not auto-detection. |