summaryrefslogtreecommitdiff
path: root/lisp/ps-mule.el
diff options
context:
space:
mode:
authorVinicius Jose Latorre <viniciusjl@ig.com.br>2006-12-01 13:13:19 +0000
committerVinicius Jose Latorre <viniciusjl@ig.com.br>2006-12-01 13:13:19 +0000
commit4abc74e836f5bbc8503558f967d8ff72bda0b902 (patch)
treee2565a0566f66370270f450b8543f7878201fe61 /lisp/ps-mule.el
parent1dccd4544e4a818ee8824ef5c3168f6e3478862a (diff)
downloademacs-4abc74e836f5bbc8503558f967d8ff72bda0b902.tar.gz
Eliminate Emacs 20 & 21 compatibility.
Diffstat (limited to 'lisp/ps-mule.el')
-rw-r--r--lisp/ps-mule.el29
1 files changed, 1 insertions, 28 deletions
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 5d2e3be573f..f67b54e28dc 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -163,34 +163,7 @@
(defalias 'string-make-multibyte 'copy-sequence))
(or (fboundp 'encode-char)
(defun encode-char (ch ccs)
- ch))
-
- ;; For Emacs 20 compatibility
- (if (and (boundp 'mule-version)
- (string< (symbol-value 'mule-version) "5.0"))
- ;; mule package is loaded and mule version is lesser than 5.0
- (progn
- (or (fboundp 'encode-composition-rule)
- (defun encode-composition-rule (rule)
- (if (= (car rule) 4) (setcar rule 10))
- (if (= (cdr rule) 4) (setcdr rule 10))
- (+ (* (car rule) 12) (cdr rule))))
- (or (fboundp 'find-composition)
- (defun find-composition (pos &rest ignore)
- (let ((ch (char-after pos)))
- (and ch (eq (char-charset ch) 'composition)
- (let ((components (decompose-composite-char ch 'vector t)))
- (list pos (ps-mule-next-point pos) components
- (integerp (aref components 1)) nil
- (char-width ch))))))))
- ;; mule package isn't loaded
- (or (fboundp 'encode-composition-rule)
- (defun encode-composition-rule (rule)
- 130))
- (or (fboundp 'find-composition)
- (defun find-composition (pos &rest ignore)
- nil))
- ))
+ ch)))
;;;###autoload