Merge egg-980316.

[elisp/egg.git] / egg.el

diff --git a/egg.el b/egg.el
index 601c981..a88bcf2 100644 (file)
--- a/egg.el
+++ b/egg.el
@@ -9,7 +9,7 @@
 ;; Maintainer: NIIBE Yutaka <gniibe@mri.co.jp>
 ;; Keywords: mule, multilingual, input method
 
-;; This file is part of EGG.
+;; This file will be part of GNU Emacs (in future).
 
 ;; EGG is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -29,12 +29,10 @@
 ;;; Commentary:
 
 ;;; Code:
-(require 'egg-edep)
-
 (defvar egg-mode-preference t
   "Non-nil if modefull.")
 
-(defvar egg-default-language)
+(defvar egg-default-language "Japanese")
 (defvar egg-last-method-name)
 (make-variable-buffer-local 'egg-last-method-name)
 
@@ -55,7 +53,6 @@
        (setq describe-current-input-method-function nil)
        (setq current-input-method nil)
        (use-local-map (keymap-parent (current-local-map)))
-       (remove-hook 'input-method-activate-hook 'its-set-mode-line-title t)
        (force-mode-line-update))
     ;; Turn on
     (if (null (string= (car arg) egg-last-method-name))
@@ -69,8 +66,7 @@
                     (egg-modeless-map)))
     (setq inactivate-current-input-method-function 'egg-mode)
     (setq describe-current-input-method-function 'egg-help)
-    (make-local-hook 'input-method-activate-hook)
-    (add-hook 'input-method-activate-hook 'its-set-mode-line-title nil t)))
+    (add-hook 'input-method-activate-hook 'its-set-mode-line-title)))
 
 (defun egg-modefull-map ()
   "Generate modefull keymap for EGG mode."  
@@ -96,96 +92,6 @@
   (interactive)
   (its-start last-command-char))
 \f
-(defvar egg-mark-list nil)
-(defvar egg-suppress-marking nil)
-
-(defun egg-set-face (beg eng face &optional object)
-  (put face 'face face)
-  (add-text-properties beg eng
-                      (list 'category face
-                            'egg-face t
-                            'modification-hooks '(egg-mark-modification))
-                      object))
-
-(defun egg-mark-modification (beg end)
-  (if (and (null egg-suppress-marking)
-          (or (get-text-property beg 'egg-face)
-              (setq beg (next-single-property-change beg 'egg-face)))
-          (or (get-text-property (1- end) 'egg-face)
-              (setq end (previous-single-property-change end 'egg-face)))
-          (< beg end))
-      (let ((list egg-mark-list)
-           (found 0)
-           pair mb me b e)
-       (add-hook 'post-command-hook 'egg-redraw-face t)
-       (setq list egg-mark-list)
-       (while (and list (< found 2))
-         (setq pair (car list)
-               list (cdr list)
-               mb (car pair)
-               me (cdr pair)
-               b (marker-position mb)
-               e (marker-position me))
-         (cond
-          ;; no overwrapping -- SKIP
-          ((or (null (eq (marker-buffer mb) (current-buffer)))
-               (or (> beg e) (< end b))))
-          ;; completely included
-          ((and (>= beg b) (<= end e))
-           (setq found 3))
-          ;; partially overwrapping
-          (t
-           (set-marker mb nil)
-           (set-marker me nil)
-           (setq egg-mark-list (delete pair egg-mark-list)
-                 beg (min beg b)
-                 end (max end e)
-                 found (1+ found)))))
-       (if (< found 3)
-           (progn
-             (setq b (make-marker)
-                   e (make-marker)
-                   egg-mark-list (cons (cons b e) egg-mark-list))
-             (set-marker b beg)
-             (set-marker e end))))))
-
-(defun egg-redraw-face ()
-  (let ((inhibit-read-only t)
-       (inhibit-point-motion-hooks t)
-       (egg-suppress-marking t)
-       (list egg-mark-list)
-       (org-buffer (current-buffer))
-       (org-point (point))
-       mb me b e p)
-    (setq egg-mark-list nil)
-    (remove-hook 'post-command-hook 'egg-redraw-face)
-    (while list
-      (setq mb (car (car list))
-           me (cdr (car list))
-           list (cdr list))
-      (when (marker-buffer mb)
-       (set-buffer (marker-buffer mb))
-       (let ((before-change-functions nil) (after-change-functions nil))
-         (save-restriction
-           (widen)
-           (setq b (max mb (point-min))
-                 e (min me (point-max)))
-           (set-marker mb nil)
-           (set-marker me nil)
-           (while (< b e)
-             (if (null (get-text-property b 'egg-face))
-                 (setq b (next-single-property-change b 'egg-face nil e)))
-             (setq p (next-single-property-change b 'egg-face nil e))
-             (when (< b p)
-               (goto-char b)
-               (setq str (buffer-substring b p))
-               (delete-region b p)
-               (remove-text-properties 0 (- p b) '(face) str)
-               (insert str)
-               (setq b p)))))))
-    (set-buffer org-buffer)
-    (goto-char org-point)))
-\f
 (defun egg-hinshi-select ()
  (menudiag-select ; Should generate at initialization time
   '(menu  "\e$BIJ;lL>\e(B:"
@@ -257,6 +163,17 @@
 (defgroup egg nil
   "Tamagotchy --- EGG Versio 4.0")
 
+;;(load-library "its/hira")
+;;(setq-default its-current-map its-hira-map)
+
+;;(load-library "egg/wnn")
+;;(load-library "egg/wnnrpc")
+;;(setq egg-conversion-backend wnn-conversion-backend)
+
+;;(load-library "egg/sj3rpc")
+;;(load-library "egg/sj3")
+;;(setq egg-conversion-backend sj3-conversion-backend)
+
 (defvar egg-support-languages nil)
 
 (defun egg-set-support-languages (langs)