diff options
| author | Kenichi Handa | 2005-03-16 11:34:41 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2005-03-16 11:34:41 +0000 |
| commit | 7bf880c67e5fc4a8faa2bf54f99032b13f7aee6a (patch) | |
| tree | 8ae91eee8459d9e10403e737b019ccc36ad8e083 /lisp/language | |
| parent | 3d4543401ae404bd47b097985fd98100d283ac6e (diff) | |
| download | emacs-7bf880c67e5fc4a8faa2bf54f99032b13f7aee6a.tar.gz emacs-7bf880c67e5fc4a8faa2bf54f99032b13f7aee6a.zip | |
(sera-being-called-by-w3): New variable.
(ethio-sera-to-fidel-ethio): Check also sera-being-called-by-w3.
(ethio-fidel-to-sera-buffer): Likewise.
Diffstat (limited to 'lisp/language')
| -rw-r--r-- | lisp/language/ethio-util.el | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 5a81f59f9dc..aec352a5f75 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el | |||
| @@ -419,6 +419,8 @@ If nil, use uppercases.") | |||
| 419 | 419 | ||
| 420 | ;; To avoid byte-compiler warnings. It should never be set globally. | 420 | ;; To avoid byte-compiler warnings. It should never be set globally. |
| 421 | (defvar ethio-sera-being-called-by-w3) | 421 | (defvar ethio-sera-being-called-by-w3) |
| 422 | ;; This variable will be bound by some third-party package. | ||
| 423 | (defvar sera-being-called-by-w3) | ||
| 422 | 424 | ||
| 423 | ;;;###autoload | 425 | ;;;###autoload |
| 424 | (defun ethio-sera-to-fidel-region (beg end &optional secondary force) | 426 | (defun ethio-sera-to-fidel-region (beg end &optional secondary force) |
| @@ -590,9 +592,11 @@ the conversion of \"a\"." | |||
| 590 | (cond | 592 | (cond |
| 591 | 593 | ||
| 592 | ;; skip from "<" to ">" (or from "&" to ";") if in w3-mode | 594 | ;; skip from "<" to ">" (or from "&" to ";") if in w3-mode |
| 593 | ((and (boundp 'ethio-sera-being-called-by-w3) | 595 | ((and (or (= ch ?<) (= ch ?&)) |
| 594 | ethio-sera-being-called-by-w3 | 596 | (or (and (boundp 'ethio-sera-being-called-by-w3) |
| 595 | (or (= ch ?<) (= ch ?&))) | 597 | ethio-sera-being-called-by-w3) |
| 598 | (and (boundp 'sera-being-called-by-w3) | ||
| 599 | sera-being-called-by-w3))) | ||
| 596 | (search-forward (if (= ch ?<) ">" ";") | 600 | (search-forward (if (= ch ?<) ">" ";") |
| 597 | nil 0)) | 601 | nil 0)) |
| 598 | 602 | ||
| @@ -1177,9 +1181,11 @@ See also the descriptions of the variables | |||
| 1177 | (goto-char (1+ (match-end 0)))) ; because we inserted one byte (\) | 1181 | (goto-char (1+ (match-end 0)))) ; because we inserted one byte (\) |
| 1178 | 1182 | ||
| 1179 | ;; skip from "<" to ">" (or from "&" to ";") if called from w3 | 1183 | ;; skip from "<" to ">" (or from "&" to ";") if called from w3 |
| 1180 | ((and (boundp 'ethio-sera-being-called-by-w3) | 1184 | ((and (or (= ch ?<) (= ch ?&)) |
| 1181 | ethio-sera-being-called-by-w3 | 1185 | (or (and (boundp 'ethio-sera-being-called-by-w3) |
| 1182 | (or (= ch ?<) (= ch ?&))) | 1186 | ethio-sera-being-called-by-w3) |
| 1187 | (and (boundp 'sera-being-called-by-w3) | ||
| 1188 | sera-being-called-by-w3))) | ||
| 1183 | (search-forward (if (= ch ?<) ">" ";") | 1189 | (search-forward (if (= ch ?<) ">" ";") |
| 1184 | nil 0)) | 1190 | nil 0)) |
| 1185 | 1191 | ||