diff options
| author | Kenichi Handa | 2004-10-16 00:23:39 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-10-16 00:23:39 +0000 |
| commit | daff7d74b49a72a4c2d8fcf0a16dd21bf919e006 (patch) | |
| tree | a6b813e52da905c05948bf185079de6ec676f833 | |
| parent | d8297f3730618efddae51806c445830c0e054fb0 (diff) | |
| download | emacs-daff7d74b49a72a4c2d8fcf0a16dd21bf919e006.tar.gz emacs-daff7d74b49a72a4c2d8fcf0a16dd21bf919e006.zip | |
(coding-system-equal): Fix merging of
2004-10-12 change.
| -rw-r--r-- | lisp/international/mule.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 2199420fd3c..5b55c4ff025 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -875,8 +875,8 @@ like `mime-charset' as well as the current style like `:mime-charset'." | |||
| 875 | Two coding systems are identical if two symbols are equal | 875 | Two coding systems are identical if two symbols are equal |
| 876 | or one is an alias of the other." | 876 | or one is an alias of the other." |
| 877 | (or (eq coding-system-1 coding-system-2) | 877 | (or (eq coding-system-1 coding-system-2) |
| 878 | (and (equal (coding-system-spec coding-system-1) | 878 | (and (equal (coding-system-plist coding-system-1) |
| 879 | (coding-system-spec coding-system-2)) | 879 | (coding-system-plist coding-system-2)) |
| 880 | (let ((eol-type-1 (coding-system-eol-type coding-system-1)) | 880 | (let ((eol-type-1 (coding-system-eol-type coding-system-1)) |
| 881 | (eol-type-2 (coding-system-eol-type coding-system-2))) | 881 | (eol-type-2 (coding-system-eol-type coding-system-2))) |
| 882 | (or (eq eol-type-1 eol-type-2) | 882 | (or (eq eol-type-1 eol-type-2) |