(ethio-sera-being-called-by-w3): New

variable.
(ethio-sera-to-fidel-ethio): Check ethio-sera-being-called-by-w3
instead of sera-being-called-by-w3.
(ethio-fidel-to-sera-buffer): Likewise.
(ethio-find-file): Bind ethio-sera-being-called-by-w3 to t
instead of sera-being-called-by-w3.
(ethio-write-file): Likewise.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73c494a55583164ac687e2e2ad131c43be49386a..9378fc84e579b394fa3dda94ae11f921e330725f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-06  Kenichi Handa  <handa@m17n.org>
+
+       * language/ethio-util.el (ethio-sera-being-called-by-w3): New
+       variable.
+       (ethio-sera-to-fidel-ethio): Check ethio-sera-being-called-by-w3
+       instead of sera-being-called-by-w3.
+       (ethio-fidel-to-sera-buffer): Likewise.
+       (ethio-find-file): Bind ethio-sera-being-called-by-w3 to t
+       instead of sera-being-called-by-w3.
+       (ethio-write-file): Likewise.
+
 2004-04-05  Nick Roberts  <nick@nick.uklinux.net>
 
        * progmodes/gdb-ui.el (gdb-use-inferior-io-buffer): New option.

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 9fc2f403655f70ff567f9adf783a711cb136d59c..5a81f59f9dc2c28e9c7b3ec50dc31c883c66e93f 100644 (file)
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -417,6 +417,9 @@ If nil, use uppercases.")
    nil nil nil nil nil
    ])
 
+;; To avoid byte-compiler warnings.  It should never be set globally.
+(defvar ethio-sera-being-called-by-w3)
+
 ;;;###autoload
 (defun ethio-sera-to-fidel-region (beg end &optional secondary force)
   "Convert the characters in region from SERA to FIDEL.
@@ -587,8 +590,8 @@ the conversion of \"a\"."
       (cond
 
        ;; skip from "<" to ">" (or from "&" to ";") if in w3-mode
-       ((and (boundp 'sera-being-called-by-w3)
-            sera-being-called-by-w3
+       ((and (boundp 'ethio-sera-being-called-by-w3)
+            ethio-sera-being-called-by-w3
             (or (= ch ?<) (= ch ?&)))
        (search-forward (if (= ch ?<) ">" ";")
                        nil 0))
@@ -1174,8 +1177,8 @@ 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 'sera-being-called-by-w3)
-              sera-being-called-by-w3
+        ((and (boundp 'ethio-sera-being-called-by-w3)
+              ethio-sera-being-called-by-w3
               (or (= ch ?<) (= ch ?&)))
          (search-forward (if (= ch ?<) ">" ";")
                          nil 0))
@@ -1835,7 +1838,7 @@ Otherwise, [0-9A-F]."
       (set-buffer-modified-p nil)))
 
    ((string-match "\\.html$" (buffer-file-name))
-    (let ((sera-being-called-by-w3 t))
+    (let ((ethio-sera-being-called-by-w3 t))
       (save-excursion
        (ethio-sera-to-fidel-marker 'force)
        (goto-char (point-min))
@@ -1872,7 +1875,7 @@ Otherwise, [0-9A-F]."
 
    ((string-match "\\.html$" (buffer-file-name))
     (save-excursion
-      (let ((sera-being-called-by-w3 t)
+      (let ((ethio-sera-being-called-by-w3 t)
            (lq (aref ethio-fidel-to-sera-map 461))
            (rq (aref ethio-fidel-to-sera-map 462)))
        (aset ethio-fidel-to-sera-map 461 "&laquote;")