Mercurial > emacs

changeset 54736:b94de166de9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Kenichi Handa <handa@m17n.org>
date Mon, 05 Apr 2004 23:27:37 +0000
parents eb44ae138199
children 1fd0476dbc7c
files lisp/language/ethio-util.el
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/language/ethio-util.el	Mon Apr 05 22:03:26 2004 +0000
+++ b/lisp/language/ethio-util.el	Mon Apr 05 23:27:37 2004 +0000
@@ -417,6 +417,9 @@
    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 @@
       (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 @@
 	  (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 @@
       (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 @@
 
    ((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;")