diff options
| author | Kenichi Handa | 2004-10-12 05:26:29 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-10-12 05:26:29 +0000 |
| commit | 5e2e859aeefcc823f0ae7c60091b4c09156a2da0 (patch) | |
| tree | 95f893c34524311cb4ff37323a283343263aa2c2 | |
| parent | ffce76c02568e51f9ab94a68109f3707cdeccbf8 (diff) | |
| download | emacs-5e2e859aeefcc823f0ae7c60091b4c09156a2da0.tar.gz emacs-5e2e859aeefcc823f0ae7c60091b4c09156a2da0.zip | |
(coding-system-equal): Moved from mule-util.el.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/international/mule.el | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb028c98a25..4738fb4812f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2004-10-12 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * international/mule.el (coding-system-equal): Moved from | ||
| 4 | mule-util.el. | ||
| 5 | |||
| 6 | * international/mule-util.el (coding-system-equal): Moved to | ||
| 7 | mule.el. | ||
| 8 | |||
| 1 | 2004-10-12 Kim F. Storm <storm@cua.dk> | 9 | 2004-10-12 Kim F. Storm <storm@cua.dk> |
| 2 | 10 | ||
| 3 | * kmacro.el (kmacro-insert-counter, kmacro-add-counter): Use and | 11 | * kmacro.el (kmacro-insert-counter, kmacro-add-counter): Use and |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 8b4ba9b2ce3..840dd67087f 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -535,6 +535,18 @@ coding system whose eol-type is N." | |||
| 535 | (and (not (> (downcase c1) (downcase c2))) | 535 | (and (not (> (downcase c1) (downcase c2))) |
| 536 | (< c1 c2))))))) | 536 | (< c1 c2))))))) |
| 537 | 537 | ||
| 538 | (defun coding-system-equal (coding-system-1 coding-system-2) | ||
| 539 | "Return t if and only if CODING-SYSTEM-1 and CODING-SYSTEM-2 are identical. | ||
| 540 | Two coding systems are identical if two symbols are equal | ||
| 541 | or one is an alias of the other." | ||
| 542 | (or (eq coding-system-1 coding-system-2) | ||
| 543 | (and (equal (coding-system-spec coding-system-1) | ||
| 544 | (coding-system-spec coding-system-2)) | ||
| 545 | (let ((eol-type-1 (coding-system-eol-type coding-system-1)) | ||
| 546 | (eol-type-2 (coding-system-eol-type coding-system-2))) | ||
| 547 | (or (eq eol-type-1 eol-type-2) | ||
| 548 | (and (vectorp eol-type-1) (vectorp eol-type-2))))))) | ||
| 549 | |||
| 538 | (defun add-to-coding-system-list (coding-system) | 550 | (defun add-to-coding-system-list (coding-system) |
| 539 | "Add CODING-SYSTEM to `coding-system-list' while keeping it sorted." | 551 | "Add CODING-SYSTEM to `coding-system-list' while keeping it sorted." |
| 540 | (if (or (null coding-system-list) | 552 | (if (or (null coding-system-list) |