[Emacs-diffs] Changes to emacs/lisp/language/ethio-util.el

[Kenichi Handa]

Index: emacs/lisp/language/ethio-util.el
diff -c emacs/lisp/language/ethio-util.el:1.33 
emacs/lisp/language/ethio-util.el:1.34
*** emacs/lisp/language/ethio-util.el:1.33      Mon Apr  5 23:27:37 2004
--- emacs/lisp/language/ethio-util.el   Wed Mar 16 11:33:14 2005
***************
*** 419,424 ****
--- 419,426 ----
  
  ;; 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,598 ****
        (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 ?&)))
        (search-forward (if (= ch ?<) ">" ";")
                        nil 0))
  
--- 592,602 ----
        (cond
  
         ;; skip from "<" to ">" (or from "&" to ";") if in w3-mode
!        ((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,1185 ****
          (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 ?&)))
          (search-forward (if (= ch ?<) ">" ";")
                          nil 0))
  
--- 1181,1191 ----
          (goto-char (1+ (match-end 0)))) ; because we inserted one byte (\)
  
         ;; skip from "<" to ">" (or from "&" to ";") if called from w3
!        ((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))