(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9cd1862d0b72ee8ff725bde4ce1c7c3b8f34229..3e35a60aa8f80500836802a31163f5d2823cc1a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-16  Kenichi Handa  <handa@m17n.org>
+
+       * language/ethio-util.el (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.
+
 2005-03-16  Juri Linkov  <juri@jurta.org>
 
        * emacs-lisp/find-func.el (find-function-regexp):

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 5a81f59f9dc2c28e9c7b3ec50dc31c883c66e93f..aec352a5f7533790bd12235974d75b3da965487c 100644 (file)
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -419,6 +419,8 @@ If nil, use uppercases.")
 
 ;; To avoid byte-compiler warnings.  It should never be set globally.
 (defvar ethio-sera-being-called-by-w3)
+;; This variable will be bound by some third-party package.
+(defvar sera-being-called-by-w3)
 
 ;;;###autoload
 (defun ethio-sera-to-fidel-region (beg end &optional secondary force)
@@ -590,9 +592,11 @@ the conversion of \"a\"."
       (cond
 
        ;; skip from "<" to ">" (or from "&" to ";") if in w3-mode
-       ((and (boundp 'ethio-sera-being-called-by-w3)
-            ethio-sera-being-called-by-w3
-            (or (= ch ?<) (= ch ?&)))
+       ((and (or (= ch ?<) (= ch ?&))
+            (or (and (boundp 'ethio-sera-being-called-by-w3)
+                     ethio-sera-being-called-by-w3)
+                (and (boundp 'sera-being-called-by-w3)
+                     sera-being-called-by-w3)))
        (search-forward (if (= ch ?<) ">" ";")
                        nil 0))
 
@@ -1177,9 +1181,11 @@ See also the descriptions of the variables
          (goto-char (1+ (match-end 0)))) ; because we inserted one byte (\)
 
         ;; skip from "<" to ">" (or from "&" to ";") if called from w3
-        ((and (boundp 'ethio-sera-being-called-by-w3)
-              ethio-sera-being-called-by-w3
-              (or (= ch ?<) (= ch ?&)))
+        ((and (or (= ch ?<) (= ch ?&))
+              (or (and (boundp 'ethio-sera-being-called-by-w3)
+                       ethio-sera-being-called-by-w3)
+                  (and (boundp 'sera-being-called-by-w3)
+                       sera-being-called-by-w3)))
          (search-forward (if (= ch ?<) ">" ";")
                          nil 0))