From: Kenichi Handa <handa@m17n.org>
Date: Wed, 16 Mar 2005 11:34:41 +0000 (+0000)
Subject: (sera-being-called-by-w3): New variable.
X-Git-Tag: ttn-vms-21-2-B4~1772
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7bf880c67e5fc4a8faa2bf54f99032b13f7aee6a;p=emacs.git

(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 e9cd1862d0b..3e35a60aa8f 100644
--- 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 5a81f59f9dc..aec352a5f75 100644
--- 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))