From 6b61353c0a0320ee15bb6488149735381fed62ec Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 16 Apr 2004 12:51:06 +0000 Subject: Sync to HEAD --- lisp/language/ethio-util.el | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'lisp/language/ethio-util.el') diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 3b59ddca661..5a81f59f9dc 100644 --- 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)) @@ -1826,7 +1829,7 @@ Otherwise, [0-9A-F]." ;;;###autoload (defun ethio-find-file nil - "Transcribe file content into Ethiopic dependig on filename suffix." + "Transcribe file content into Ethiopic depending on filename suffix." (cond ((string-match "\\.sera$" (buffer-file-name)) @@ -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 "«te;") @@ -2005,4 +2008,5 @@ mark." ;; (provide 'ethio-util) +;;; arch-tag: c8feb3d6-39bf-4b0a-b6ef-26f03fbc8140 ;;; ethio-util.el ends here -- cgit v1.2.1