re-make patch from tamago CVS repos.
This commit is contained in:
jun
parent
d68d8a19b0
commit
12a6139dad
2 changed files with 655 additions and 96 deletions
|
|
@ -1,3 +1,3 @@
|
|||
$NetBSD: patch-sum,v 1.1 2001/02/08 03:24:11 jun Exp $
|
||||
$NetBSD: patch-sum,v 1.2 2001/02/16 08:14:04 jun Exp $
|
||||
|
||||
MD5 (patch-aa) = 8e07137ac410432738ba342b99d13e69
|
||||
MD5 (patch-aa) = 11d76cc5060e0addc75a97817980169a
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aa,v 1.1 2001/02/08 03:24:12 jun Exp $
|
||||
|
||||
diff -u -3 ../tamago-4.0.6/ChangeLog ./ChangeLog
|
||||
$NetBSD: patch-aa,v 1.2 2001/02/16 08:14:04 jun Exp $
|
||||
Common subdirectories: ../tamago-4.0.6/CVS and ./CVS
|
||||
diff -Ndu ../tamago-4.0.6/ChangeLog ./ChangeLog
|
||||
--- ../tamago-4.0.6/ChangeLog Mon Jan 17 09:48:50 2000
|
||||
+++ ./ChangeLog
|
||||
+++ ./ChangeLog Sun Jan 28 03:53:13 2001
|
||||
@@ -1,3 +1,129 @@
|
||||
+2000-06-02 KATAYAMA Yoshio <kate@pfu.co.jp>
|
||||
+
|
||||
|
|
@ -133,9 +133,9 @@ diff -u -3 ../tamago-4.0.6/ChangeLog ./ChangeLog
|
|||
2000-01-17 TOMURA Satoru <tomura@etl.go.jp>
|
||||
|
||||
* Version 4.0.6 released
|
||||
diff -u -3 ../tamago-4.0.6/Makefile.in ./Makefile.in
|
||||
diff -Ndu ../tamago-4.0.6/Makefile.in ./Makefile.in
|
||||
--- ../tamago-4.0.6/Makefile.in Sun Jan 16 00:39:09 2000
|
||||
+++ ./Makefile.in
|
||||
+++ ./Makefile.in Sun Jan 28 03:53:13 2001
|
||||
@@ -138,8 +139,8 @@
|
||||
egg/sj3rpc.elc: egg-com.elc egg/sj3.elc
|
||||
egg/wnnrpc.elc: egg-com.elc egg/wnn.elc
|
||||
|
|
@ -149,9 +149,9 @@ diff -u -3 ../tamago-4.0.6/Makefile.in ./Makefile.in
|
|||
|
||||
Common subdirectories: ../tamago-4.0.6/doc and ./doc
|
||||
Common subdirectories: ../tamago-4.0.6/egg and ./egg
|
||||
diff -u -3 ../tamago-4.0.6/egg-cnv.el ./egg-cnv.el
|
||||
diff -Ndu ../tamago-4.0.6/egg-cnv.el ./egg-cnv.el
|
||||
--- ../tamago-4.0.6/egg-cnv.el Tue Jan 11 20:59:10 2000
|
||||
+++ ./egg-cnv.el
|
||||
+++ ./egg-cnv.el Sun Jan 28 03:53:13 2001
|
||||
@@ -34,19 +34,29 @@
|
||||
(require 'egg-edep)
|
||||
|
||||
|
|
@ -726,9 +726,9 @@ diff -u -3 ../tamago-4.0.6/egg-cnv.el ./egg-cnv.el
|
|||
(progn
|
||||
(goto-char (next-single-property-change (point) 'egg-end))
|
||||
(egg-decide-before-point))))
|
||||
diff -u -3 ../tamago-4.0.6/egg-com.el ./egg-com.el
|
||||
diff -Ndu ../tamago-4.0.6/egg-com.el ./egg-com.el
|
||||
--- ../tamago-4.0.6/egg-com.el Tue Jan 4 15:49:56 2000
|
||||
+++ ./egg-com.el
|
||||
+++ ./egg-com.el Sun Jan 28 03:53:13 2001
|
||||
@@ -136,6 +136,7 @@
|
||||
(cons ccl-decode-fixed-euc-kr ccl-encode-fixed-euc-kr))
|
||||
|
||||
|
|
@ -895,10 +895,527 @@ diff -u -3 ../tamago-4.0.6/egg-com.el ./egg-com.el
|
|||
((eq f 'w) `(setq ,arg (comm-unpack-u16)))
|
||||
((eq f 'b) `(setq ,arg (comm-unpack-u8)))
|
||||
((eq f 'S) `(setq ,arg (comm-unpack-u16-string)))
|
||||
Only in ../tamago-4.0.6: egg-sim-old.el
|
||||
diff -u -3 ../tamago-4.0.6/egg-sim.el ./egg-sim.el
|
||||
diff -Ndu ../tamago-4.0.6/egg-sim-old.el ./egg-sim-old.el
|
||||
--- ../tamago-4.0.6/egg-sim-old.el Mon Jan 17 01:43:15 2000
|
||||
+++ ./egg-sim-old.el Thu Jan 1 09:00:00 1970
|
||||
@@ -1,514 +0,0 @@
|
||||
-;;; egg-sim.el --- EGG Simple Input Method
|
||||
-
|
||||
-;; Copyright (C) 2000 Electrotechnical Laboratory, JAPAN.
|
||||
-;; Licensed to the Free Software Foundation.
|
||||
-;; Copyright (C) 2000 TOMURA Satoru <tomura@etl.go.jp>
|
||||
-
|
||||
-
|
||||
-;; Author: TOMURA Satoru <tomura@etl.go.jp>
|
||||
-
|
||||
-;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
|
||||
-
|
||||
-;; Keywords: mule, multilingual, input method
|
||||
-
|
||||
-;; This file is part of EGG.
|
||||
-
|
||||
-;; EGG is free software; you can redistribute it and/or modify
|
||||
-;; it under the terms of the GNU General Public License as published by
|
||||
-;; the Free Software Foundation; either version 2, or (at your option)
|
||||
-;; any later version.
|
||||
-
|
||||
-;; EGG is distributed in the hope that it will be useful,
|
||||
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
-;; GNU General Public License for more details.
|
||||
-
|
||||
-;; You should have received a copy of the GNU General Public License
|
||||
-;; along with GNU Emacs; see the file COPYING. If not, write to the
|
||||
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
-;; Boston, MA 02111-1307, USA.
|
||||
-
|
||||
-;;; Commentary:
|
||||
-
|
||||
-;;; Code:
|
||||
-
|
||||
-;;; This code is based on egg-jsymbol.el of Egg V3.
|
||||
-
|
||||
-;;; 92.10.18 modified for Mule Ver.0.9.6 by K.Handa <handa@etl.go.jp>
|
||||
-;;; Moved from egg.el
|
||||
-;;; 92.12.26 modified for Mule Ver.0.9.7 by T.Shingu <shingu@cpr.canon.co.jp>
|
||||
-;;; JIS Hojo Kanji support.
|
||||
-
|
||||
-(require 'menudiag)
|
||||
-
|
||||
-(provide 'egg-sim)
|
||||
-
|
||||
-(defun make-char-list (charset &optional from to)
|
||||
- (let ((result nil)
|
||||
- (chars (charset-chars charset))
|
||||
- min max)
|
||||
- (setq min (if (= chars 96) 32 33)
|
||||
- max (if (= chars 96) 127 126))
|
||||
- (setq from (if from (+ min (1- from)) min)
|
||||
- to (if to (+ min (1- to)) max))
|
||||
- (and (<= min from)
|
||||
- (<= to max)
|
||||
- (cond ((= (charset-dimension charset) 1)
|
||||
- (while (<= from to)
|
||||
- (setq result (cons (char-to-string
|
||||
- (make-char charset to))
|
||||
- result)
|
||||
- to (1- to)))
|
||||
- result)
|
||||
- ((= (charset-dimension charset) 2)
|
||||
- (while (<= from to)
|
||||
- (let ((code max))
|
||||
- (while (<= min code)
|
||||
- (setq result (cons (char-to-string
|
||||
- (make-char charset to code))
|
||||
- result)
|
||||
- code (1- code))))
|
||||
- (setq to (1- to)))
|
||||
- result)))))
|
||||
-
|
||||
-(defvar egg-sim-ascii-menu
|
||||
- '(menu "ASCII:" ,(make-char-list 'ascii)))
|
||||
-
|
||||
-(defvar egg-sim-latin-1-menu
|
||||
- `(menu "ISO 8859-1:" ,(make-char-list 'latin-iso8859-1)))
|
||||
-
|
||||
-(defvar egg-sim-latin-2-menu
|
||||
- `(menu "ISO 8859-2:" ,(make-char-list 'latin-iso8859-2)))
|
||||
-
|
||||
-(defvar egg-sim-latin-3-menu
|
||||
- `(menu "ISO 8859-3:" ,(make-char-list 'latin-iso8859-3)))
|
||||
-
|
||||
-(defvar egg-sim-latin-4-menu
|
||||
- `(menu "ISO 8859-4:" ,(make-char-list 'latin-iso8859-4)))
|
||||
-
|
||||
-(defvar egg-sim-latin-5-menu
|
||||
- `(menu "ISO 8859-9:" ,(make-char-list 'latin-iso8859-9)))
|
||||
-
|
||||
-(defvar egg-sim-cyrillic-menu
|
||||
- `(menu "ISO 8859-5:" ,(make-char-list 'cyrillic-iso8859-5)))
|
||||
-
|
||||
-(defvar egg-sim-arabic-menu
|
||||
- `(menu "ISO 8859-6:" ,(make-char-list 'arabic-iso8859-6)))
|
||||
-
|
||||
-(defvar egg-sim-greek-menu
|
||||
- `(menu "ISO 8859-7:" ,(make-char-list 'greek-iso8859-7)))
|
||||
-
|
||||
-(defvar egg-sim-hebrew-menu
|
||||
- `(menu "ISO 8859-8:" ,(make-char-list 'hebrew-iso8859-8)))
|
||||
-
|
||||
-(defvar egg-sim-thai-menu
|
||||
- `(menu "TIS620.2529:" ,(make-char-list 'thai-tis620)))
|
||||
-
|
||||
-(defvar egg-sim-lao-menu
|
||||
- `(menu "lao:" ,(make-char-list 'lao)))
|
||||
-
|
||||
-(defvar egg-sim-vietnamese-menu
|
||||
- `(menu "Vietnamese:"
|
||||
- (("VISCII1.1(lower-case)" .
|
||||
- (menu "VISCII1.1 lower-case:"
|
||||
- ,(make-char-list 'vietnamese-viscii-lower)))
|
||||
- ("VISCII1.1(upper-case)" .
|
||||
- (menu "VISCII1.1 upper-case:"
|
||||
- ,(make-char-list 'vietnamese-viscii-upper))))))
|
||||
-
|
||||
-(defvar egg-sim-chinese-big5-menu
|
||||
- `(menu "Big5:"
|
||||
- (("Level1" .
|
||||
- (menu "Big 5 Level1:" , (make-char-list 'chinese-big5-1)))
|
||||
- ("Level2" .
|
||||
- (menu "Big 5 Level2:" , (make-char-list 'chinese-big5-2))))))
|
||||
-
|
||||
-(defvar egg-sim-chinese-cns-menu
|
||||
- `(menu "CNS 11643:"
|
||||
- (("Plane-1" .
|
||||
- (menu "CNS 11643-1:" ,(make-char-list 'chinese-cns11643-1)))
|
||||
- ("Plane- 2" .
|
||||
- (menu "CNS 11643-2:" ,(make-char-list 'chinese-cns11643-2)))
|
||||
- ("Plane-3" .
|
||||
- (menu "CNS 11643-3:" ,(make-char-list 'chinese-cns11643-3)))
|
||||
- ("Plane-4" .
|
||||
- (menu "CNS 11643-4:" ,(make-char-list 'chinese-cns11643-4)))
|
||||
- ("Plane-5" .
|
||||
- (menu "CNS 11643-5:" ,(make-char-list 'chinese-cns11643-5)))
|
||||
- ("Plane-6" .
|
||||
- (menu "CNS 11643-6:" ,(make-char-list 'chinese-cns11643-6)))
|
||||
- ("Plane-7" .
|
||||
- (menu "CNS 11643-7:" ,(make-char-list 'chinese-cns11643-7))))))
|
||||
-
|
||||
-(defvar egg-sim-chinese-gb-menu
|
||||
- `(menu "GB 2312:"
|
||||
- (("All" .
|
||||
- (menu "GB 2312:" ,(make-char-list 'chinese-gb2312)))
|
||||
- ("Symbols" .
|
||||
- (menu "GB2312/1:" ,(make-char-list 'chinese-gb2312 1 1)))
|
||||
- ("Numbers" .
|
||||
- (menu "GB2312/2:" ,(make-char-list 'chinese-gb2312 2 2)))
|
||||
- ("Fullwidth ASCII" .
|
||||
- (menu "GB2312/3:" ,(make-char-list 'chinese-gb2312 3 3)))
|
||||
- ("Hiragana" .
|
||||
- (menu "GB2312/4:" ,(make-char-list 'chinese-gb2312 4 4)))
|
||||
- ("Katanaka" .
|
||||
- (menu "GB2312/5:" ,(make-char-list 'chinese-gb2312 5 5)))
|
||||
- ("Greek" .
|
||||
- (menu "GB2312/6:" ,(make-char-list 'chinese-gb2312 6 6)))
|
||||
- ("Cyrillic" .
|
||||
- (menu "GB2312/7:" ,(make-char-list 'chinese-gb2312 7 7)))
|
||||
- ("Pinyin/Bopomofo" .
|
||||
- (menu "GB2312/8:" ,(make-char-list 'chinese-gb2312 8 8)))
|
||||
- ("Box Drawings" .
|
||||
- (menu "GB2312/9:" ,(make-char-list 'chinese-gb2312 9 9)))
|
||||
- )))
|
||||
-
|
||||
-(defvar egg-sim-chinese-menu
|
||||
- `(menu "Chinese:"
|
||||
- (("GB2312" . , egg-sim-chinese-gb-menu)
|
||||
- ("CNS11643" . , egg-sim-chinese-cns-menu)
|
||||
- ("Big5" . , egg-sim-chinese-big5-menu))))
|
||||
-
|
||||
-(defvar egg-sim-korean-menu
|
||||
- `(menu "Korean:"
|
||||
- (("KSC5601" .
|
||||
- (menu "KSC 5601:" ,(make-char-list 'korean-ksc5601)))
|
||||
- ("Symbol" .
|
||||
- (menu "KSC 5601/1-2:" ,(make-char-list 'korean-ksc5601 1 2)))
|
||||
- ("Fullwidth ASCII" .
|
||||
- (menu "KSC 5601/3:" , (make-char-list 'korean-ksc5601 3 3)))
|
||||
- ("Jamo" .
|
||||
- (menu "KSC 5601/4:" , (make-char-list 'korean-ksc5601 4 4)))
|
||||
- ("Roman Number/Greek" .
|
||||
- (menu "KSC 5601/5:" , (make-char-list 'korean-ksc5601 5 5)))
|
||||
- ("Box Drawings" .
|
||||
- (menu "KSC 5601/6:" , (make-char-list 'korean-ksc5601 6 6)))
|
||||
- ("Unit" .
|
||||
- (menu "KSC 5601/7:" , (make-char-list 'korean-ksc5601 7 7)))
|
||||
- ("Misc." .
|
||||
- (menu "KSC 5601/8-9:" , (make-char-list 'korean-ksc5601 8 9)))
|
||||
- ("Hiragana" .
|
||||
- (menu "KSC 5601/10:" , (make-char-list 'korean-ksc5601 10 10)))
|
||||
- ("Katakana" .
|
||||
- (menu "KSC 5601/11:" , (make-char-list 'korean-ksc5601 11 11)))
|
||||
- ("Cyrillic" .
|
||||
- (menu "KSC 5601/12:" , (make-char-list 'korean-ksc5601 12 12)))
|
||||
- ("Hangul" .
|
||||
- (menu "KSC 5601/16-40:" , (make-char-list 'korean-ksc5601 16 40)))
|
||||
- ("Hanja" .
|
||||
- (menu "KSC 5601/42-93:" , (make-char-list 'korean-ksc5601 42 93))))))
|
||||
-
|
||||
-(defvar egg-sim-japanese-menu
|
||||
- `(menu "Japanese:"
|
||||
- (("JISX0201" .
|
||||
- ,(append (make-char-list 'latin-jisx0201)
|
||||
- (make-char-list 'katakana-jisx0201)))
|
||||
- ("JISX0208" .
|
||||
- (menu "JIS X 0208:" ,(make-char-list 'japanese-jisx0208)))
|
||||
- ("JISX0212" .
|
||||
- (menu "JIS X 0212:" ,(make-char-list 'japanese-jisx0212)))
|
||||
- ("JISX0208/0212" .
|
||||
- (menu "$B5-9fF~NO(B:"
|
||||
- (("JIS$BF~NO(B" . japanese-jisx0208)
|
||||
- ("$B5-9f(B" .
|
||||
- (menu "$B5-9f(B:" , (make-char-list 'japanese-jisx0208 1 2)))
|
||||
- ("$B1Q?t;z(B" .
|
||||
- (menu "$B1Q?t;z(B:" , (make-char-list 'japanese-jisx0208 3 3)))
|
||||
- ("$B$R$i$,$J(B" .
|
||||
- (menu "$B$R$i$,$J(B:" , (make-char-list 'japanese-jisx0208 4 4)))
|
||||
- ("$B%+%?%+%J(B" .
|
||||
- (menu "$B%+%?%+%J(B:" , (make-char-list 'japanese-jisx0208 5 5)))
|
||||
- ("$B%.%j%7%cJ8;z(B" .
|
||||
- (menu "$B%.%j%7%cJ8;z(B:" , (make-char-list 'japanese-jisx0208 6 6)))
|
||||
- ("$B%-%j%kJ8;z(B" .
|
||||
- (menu "$B%-%j%kJ8;z(B:" , (make-char-list 'japanese-jisx0208 7 7)))
|
||||
- ("$B7S@~(B" .
|
||||
- (menu "$B7S@~(B:" , (make-char-list 'japanese-jisx0208 8 8)))
|
||||
- ;;;"$BIt<sF~NO(B" (bushyu-input)
|
||||
- ;;; "$B2h?tF~NO(B" (kakusuu-input)
|
||||
- ("$BBh0l?e=`(B" .
|
||||
- (menu "$BBh0l?e=`(B:" , (make-char-list 'japanese-jisx0208 16 47)))
|
||||
- ("$BBhFs?e=`(B" .
|
||||
- (menu "$BBhFs?e=`(B:" , (make-char-list 'japanese-jisx0208 48 84)))
|
||||
- ("$BJd=u4A;z(B" .
|
||||
- (menu "$BJd=u4A;z(B:" , (make-char-list 'japanese-jisx0212 2 77)))))))))
|
||||
-
|
||||
-(defvar egg-sim-ipa-menu
|
||||
- `(menu "IPA:" ,(make-char-list 'ipa)))
|
||||
-
|
||||
-(defvar egg-sisheng-menu
|
||||
- `(menu "SiSheng characters" ,(make-char-list 'chinese-sisheng)))
|
||||
-
|
||||
-(defvar egg-sim-code-input-menu
|
||||
- `(menu "Charset:"
|
||||
- (("JISX0208" . japanese-jisx0208)
|
||||
- ("JISX0212" . japanese-jisx0212)
|
||||
- ("CNS11643-1" . chinese-cns11634-1)
|
||||
- ("CNS11643-2" . chinese-cns11634-2)
|
||||
- ("CNS11643-3" . chinese-cns11634-3)
|
||||
- ("CNS11643-4" . chinese-cns11634-4)
|
||||
- ("CNS11643-5" . chinese-cns11634-5)
|
||||
- ("CNS11643-6" . chinese-cns11634-6)
|
||||
- ("CNS11643-7" . chinese-cns11634-7)
|
||||
- ("Big5-1" . chinese-big5-1)
|
||||
- ("Big5-2" . chinese-big5-2)
|
||||
- ("GB2312" . chinese-gb2312)
|
||||
- ("KSC5601" . korean-ksc5601))))
|
||||
-
|
||||
-(defvar egg-simple-input-method-menu-item-list
|
||||
- `(("Code Input" . ,egg-sim-code-input-menu)
|
||||
- ("Arabic" . , egg-sim-arabic-menu)
|
||||
- ("ASCII" . , egg-sim-ascii-menu)
|
||||
- ("Chinese" . , egg-sim-chinese-menu)
|
||||
- ("Cyrillic" . , egg-sim-cyrillic-menu)
|
||||
- ("Greek" . , egg-sim-greek-menu)
|
||||
- ("Hebrew" . , egg-sim-hebrew-menu)
|
||||
- ("Japanese" . , egg-sim-japanese-menu)
|
||||
- ("Korean" . , egg-sim-korean-menu)
|
||||
- ("Latin" .
|
||||
- (menu "Latin:"
|
||||
- (("Latin-1" . , egg-sim-latin-1-menu)
|
||||
- ("Latin-2" . , egg-sim-latin-2-menu)
|
||||
- ("Latin-3" . , egg-sim-latin-3-menu)
|
||||
- ("Latin-4" . , egg-sim-latin-4-menu)
|
||||
- ("Latin-5" . , egg-sim-latin-5-menu))))
|
||||
- ("Thai/Lao" .
|
||||
- (menu "Thai/Lao:"
|
||||
- (("Thai" . , egg-sim-thai-menu)
|
||||
- ("Lao" . , egg-sim-lao-menu))))
|
||||
- ("Vietnamese" . , egg-sim-vietnamese-menu)
|
||||
- ("Phonetic code" .
|
||||
- (menu "Phonetic code:"
|
||||
- (("SISHENG" . , egg-sisheng-menu)
|
||||
- ("IPA" . , egg-sim-ipa-menu))))
|
||||
- ))
|
||||
-
|
||||
-(defvar egg-language-environment-alist
|
||||
- `(("ASCII" . , egg-sim-ascii-menu)
|
||||
- ("Chinese-BIG5" . , egg-sim-chinese-big5-menu)
|
||||
- ("Chinese-CNS" . , egg-sim-chinese-cns-menu)
|
||||
- ("Chinese-GB" . , egg-sim-chinese-gb-menu)
|
||||
- ("Cyrillic-ISO" . , egg-sim-cyrillic-menu)
|
||||
- ("Cyrillic-KOI8" . , egg-sim-cyrillic-menu)
|
||||
- ("Cyrillic-ALT" . , egg-sim-cyrillic-menu)
|
||||
- ("Czech" . , egg-sim-latin-2-menu)
|
||||
- ("Devanagari")
|
||||
- ("English" . , egg-sim-ascii-menu)
|
||||
- ("Ethiopic")
|
||||
- ("German" . , egg-sim-latin-1-menu)
|
||||
- ("Greek" . , egg-sim-greek-menu)
|
||||
- ("Hebrew" . , egg-sim-hebrew-menu)
|
||||
- ("Hindi")
|
||||
- ("IPA" . , egg-sim-ipa-menu)
|
||||
- ("Japanese" . , egg-sim-japanese-menu)
|
||||
- ("Korean" . , egg-sim-korean-menu)
|
||||
- ("Lao" . , egg-sim-lao-menu)
|
||||
- ("Latin-1" . , egg-sim-latin-1-menu)
|
||||
- ("Latin-2" . , egg-sim-latin-2-menu)
|
||||
- ("Latin-3" . , egg-sim-latin-3-menu)
|
||||
- ("Latin-4" . , egg-sim-latin-4-menu)
|
||||
- ("Latin-5" . , egg-sim-latin-5-menu)
|
||||
- ("Romaian" . , egg-sim-latin-2-menu)
|
||||
- ("Slovenian" . , egg-sim-latin-2-menu)
|
||||
- ("Slovak" . , egg-sim-latin-2-menu)
|
||||
- ("Thai" . , egg-sim-thai-menu)
|
||||
- ("Tibetan")
|
||||
- ("Turkish" . , egg-sim-latin-5-menu)
|
||||
- ("Vietnamese" . , egg-sim-vietnamese-menu)))
|
||||
-
|
||||
-(defvar egg-simple-input-method-menu
|
||||
- `(menu "Character set:" , egg-simple-input-method-menu-item-list))
|
||||
-
|
||||
-;;;;###autoload
|
||||
-(defun egg-simple-input-method()
|
||||
- (interactive)
|
||||
- (let ((result (egg-simple-input-menu)))
|
||||
- (cond((stringp result)
|
||||
- (insert result))
|
||||
- ((symbolp result)
|
||||
- (egg-character-code-input result
|
||||
- (format "%s/Character Code in Hexadecimal:"
|
||||
- (charset-description result)))))))
|
||||
-
|
||||
-(defun egg-simple-input-menu ()
|
||||
- (let ((menu (cdr-safe (assoc current-language-environment
|
||||
- egg-language-environment-alist))))
|
||||
- (if menu
|
||||
- (menudiag-select
|
||||
- `(menu "Character set:" ,(cons (cons current-language-environment
|
||||
- menu)
|
||||
- egg-simple-input-method-menu-item-list)))
|
||||
- (menudiag-select egg-simple-input-method-menu))))
|
||||
-
|
||||
-(defun egg-character-code-input (charset prompt)
|
||||
- (egg-insert-character-code-from-minibuffer charset prompt))
|
||||
-
|
||||
-(defun egg-insert-character-code-from-minibuffer (charset prompt)
|
||||
- (let ((str (read-from-minibuffer prompt)) val)
|
||||
- (while (null (setq val (egg-read-character-code-from-string str charset)))
|
||||
- (beep)
|
||||
- (setq str (read-from-minibuffer prompt str)))
|
||||
- (insert (make-char charset (car val) (cdr val)))))
|
||||
-
|
||||
-(defun egg-hexadigit-value (ch)
|
||||
- (cond((and (<= ?0 ch) (<= ch ?9))
|
||||
- (- ch ?0))
|
||||
- ((and (<= ?a ch) (<= ch ?f))
|
||||
- (+ (- ch ?a) 10))
|
||||
- ((and (<= ?A ch) (<= ch ?F))
|
||||
- (+ (- ch ?A) 10))))
|
||||
-
|
||||
-(defun egg-read-character-code-from-string (str charset)
|
||||
- (if (and (= (length str) 4)
|
||||
- (<= 2 (egg-hexadigit-value (aref str 0)))
|
||||
- (egg-hexadigit-value (aref str 1))
|
||||
- (<= 2 (egg-hexadigit-value (aref str 2)))
|
||||
- (egg-hexadigit-value (aref str 3)))
|
||||
- (let ((code1 (+ (* 16 (egg-hexadigit-value (aref str 0)))
|
||||
- (egg-hexadigit-value (aref str 1))))
|
||||
- (code2 (+ (* 16 (egg-hexadigit-value (aref str 2)))
|
||||
- (egg-hexadigit-value (aref str 3))))
|
||||
- (min (if (= (charset-chars charset) 94)
|
||||
- 33 32))
|
||||
- (max (if (= (charset-chars charset) 94)
|
||||
- 126 127)))
|
||||
- (and (<= min code1)
|
||||
- (<= code1 max)
|
||||
- (<= min code2)
|
||||
- (<= code2 max)
|
||||
- (cons code1 code2)))))
|
||||
-
|
||||
-;;;
|
||||
-;;;
|
||||
-;;;
|
||||
-
|
||||
-(defun make-non-iso2022-code-table-file (name)
|
||||
- (with-temp-file name
|
||||
- (set-buffer-multibyte nil)
|
||||
- (insert ";;; -*- coding: -*-\n\n")
|
||||
- (insert " |")
|
||||
-
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format " %X " i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (insert "-+")
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format "----" i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format "%X|" i))
|
||||
- (let ((j 0) (c i))
|
||||
- (while (< j 16)
|
||||
- (insert (format " \"%c\"" c))
|
||||
- (setq j (1+ j)
|
||||
- c (+ c 16)))
|
||||
- (insert (format "\n")))
|
||||
- (setq i (1+ i))))))
|
||||
-
|
||||
-(defun make-iso2022-94char-code-table-file (name)
|
||||
- (with-temp-file name
|
||||
- (set-buffer-multibyte nil)
|
||||
- (insert ";;; -*- coding: -*-\n\n")
|
||||
- (insert " |")
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format " %X " i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (insert "-+")
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format "----" i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format "%X|" i))
|
||||
- (let ((j 0) (c i))
|
||||
- (while (< j 16)
|
||||
- (if (or (<= c 31)
|
||||
- (= c 127)
|
||||
- (and (<= 128 c)
|
||||
- (<= c 160))
|
||||
- (= c 255))
|
||||
- (insert " ")
|
||||
- (insert (format " \"%c\"" c)))
|
||||
- (setq j (1+ j)
|
||||
- c (+ c 16)))
|
||||
- (insert (format "\n")))
|
||||
- (setq i (1+ i))))))
|
||||
-
|
||||
-(defun make-iso2022-96char-code-table-file (name)
|
||||
- (with-temp-file name
|
||||
- (set-buffer-multibyte nil)
|
||||
- (insert ";;; -*- coding: -*-\n\n")
|
||||
- (insert " |")
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format " %X " i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (insert "-+")
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format "----" i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (let ((i 0))
|
||||
- (while (< i 16)
|
||||
- (insert (format "%X|" i))
|
||||
- (let ((j 0) (c i))
|
||||
- (while (< j 16)
|
||||
- (if (or (<= c 31)
|
||||
- (= c 127)
|
||||
- (and (<= 128 c)
|
||||
- (< c 160)))
|
||||
- (insert " ")
|
||||
- (insert (format " \"%c\"" c)))
|
||||
- (setq j (1+ j)
|
||||
- c (+ c 16)))
|
||||
- (insert (format "\n")))
|
||||
- (setq i (1+ i))))))
|
||||
-
|
||||
-(defun make-euc-code-table-file (name)
|
||||
- (with-temp-file name
|
||||
- (set-buffer-multibyte nil)
|
||||
- (insert ";;; -*- coding: -*-\n\n")
|
||||
- (insert " |")
|
||||
- (let ((i 1))
|
||||
- (while (<= i 94)
|
||||
- ;; "XX"
|
||||
- (insert (format " %02d " i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (insert "-+")
|
||||
- (let ((i 1))
|
||||
- (while (<= i 94)
|
||||
- (insert (format "-----" i))
|
||||
- (setq i (1+ i))))
|
||||
- (insert "\n")
|
||||
-
|
||||
- (let ((i 1))
|
||||
- (while (<= i 94)
|
||||
- (insert (format "%02d|" i))
|
||||
- (let ((j 1))
|
||||
- (while (<= j 94)
|
||||
- (insert (format " \"%c%c\""
|
||||
- (+ i 32 128)
|
||||
- (+ j 32 128)))
|
||||
- (setq j (1+ j)))
|
||||
- (insert (format "\n")))
|
||||
- (setq i (1+ i))))))
|
||||
diff -Ndu ../tamago-4.0.6/egg-sim.el ./egg-sim.el
|
||||
--- ../tamago-4.0.6/egg-sim.el Mon Jan 17 01:51:34 2000
|
||||
+++ ./egg-sim.el
|
||||
+++ ./egg-sim.el Sun Jan 28 03:53:13 2001
|
||||
@@ -73,7 +73,7 @@
|
||||
result)))))
|
||||
|
||||
|
|
@ -923,10 +1440,60 @@ diff -u -3 ../tamago-4.0.6/egg-sim.el ./egg-sim.el
|
|||
(insert (format "\n")))
|
||||
- (setq i (1+ i))))))
|
||||
+ (setq i (1+ i))))))
|
||||
Only in ../tamago-4.0.6: egg-simv.el
|
||||
diff -u -3 ../tamago-4.0.6/egg.el ./egg.el
|
||||
diff -Ndu ../tamago-4.0.6/egg-simv.el ./egg-simv.el
|
||||
--- ../tamago-4.0.6/egg-simv.el Mon Jan 17 01:42:21 2000
|
||||
+++ ./egg-simv.el Thu Jan 1 09:00:00 1970
|
||||
@@ -1,47 +0,0 @@
|
||||
-
|
||||
- | 0 1 2 3 4 5 6 7 8 9 A B C D E F
|
||||
--+----------------------------------------------------------------
|
||||
-0| " " "0" "@" "P" "`" "p" ",2U(B" ",20(B" ",2u(B" ",10(B" ",2`(B" ",2p(B" ",1`(B" ",1p(B"
|
||||
-1| "!" "1" "A" "Q" "a" "q" ",2!(B" ",21(B" ",1!(B" ",11(B" ",2a(B" ",1Q(B" ",1a(B" ",1q(B"
|
||||
-2| ",2F(B" """ "2" "B" "R" "b" "r" ",2"(B" ",22(B" ",1"(B" ",12(B" ",2b(B" ",2r(B" ",1b(B" ",1r(B"
|
||||
-3| "#" "3" "C" "S" "c" "s" ",2#(B" ",25(B" ",1#(B" ",2^(B" ",2c(B" ",2s(B" ",1c(B" ",1s(B"
|
||||
-4| ",2V(B" "$" "4" "D" "T" "d" "t" ",2$(B" ",2~(B" ",1$(B" ",2=(B" ",2d(B" ",2t(B" ",1d(B" ",1t(B"
|
||||
-5| ",2G(B" "%" "5" "E" "U" "e" "u" ",2%(B" ",2>(B" ",1%(B" ",15(B" ",2e(B" ",1U(B" ",1e(B" ",1u(B"
|
||||
-6| ",2g(B" "&" "6" "F" "V" "f" "v" ",2&(B" ",26(B" ",1&(B" ",16(B" ",1F(B" ",1V(B" ",1f(B" ",1v(B"
|
||||
-7| "'" "7" "G" "W" "g" "w" ",2'(B" ",27(B" ",1'(B" ",17(B" ",1G(B" ",1W(B" ",1g(B" ",1w(B"
|
||||
-8| "(" "8" "H" "X" "h" "x" ",2((B" ",28(B" ",1((B" ",18(B" ",2h(B" ",1X(B" ",1h(B" ",1x(B"
|
||||
-9| ",2[(B" ")" "9" "I" "Y" "i" "y" ",2)(B" ",2v(B" ",1)(B" ",2q(B" ",2i(B" ",2y(B" ",1i(B" ",1y(B"
|
||||
-A| "*" ":" "J" "Z" "j" "z" ",2*(B" ",2w(B" ",1*(B" ",2Q(B" ",2j(B" ",2z(B" ",1j(B" ",1z(B"
|
||||
-B| "+" ";" "K" "[" "k" "{" ",2+(B" ",2o(B" ",1+(B" ",2W(B" ",2k(B" ",1[(B" ",1k(B" ",1{(B"
|
||||
-C| "," "<" "L" "\" "l" "|" ",2,(B" ",2|(B" ",1,(B" ",2X(B" ",2l(B" ",1\(B" ",1l(B" ",1|(B"
|
||||
-D| "-" "=" "M" "]" "m" "}" ",2-(B" ",2{(B" ",1-(B" ",1=(B" ",2m(B" ",2}(B" ",1m(B" ",1}(B"
|
||||
-E| ",2\(B" "." ">" "N" "^" "n" "~" ",2.(B" ",2x(B" ",1.(B" ",1>(B" ",2n(B" ",1^(B" ",1n(B" ",1~(B"
|
||||
-F| "/" "?" "O" "_" "o" ",2/(B" ",2O(B" ",1/(B" ",2_(B" ",1O(B" ",1_(B" ",1o(B" ",2f(B"
|
||||
-
|
||||
-"a" ",1`(B" ",1d(B" ",1c(B" ",1a(B" ",1U(B"
|
||||
-",1e(B" ",1"(B" ",1F(B" ",1G(B" ",1!(B" ",1#(B"
|
||||
-",1b(B" ",1%(B" ",1&(B" ",1g(B" ",1$(B" ",1'(B"
|
||||
-"e" ",1i(B" ",1k(B" ",1((B" ",1h(B" ",1)(B"
|
||||
-",1j(B" ",1*(B" ",1,(B" ",1-(B" ",1+(B" ",1.(B"
|
||||
-"i" ",1m(B" ",1o(B" ",1n(B" ",1l(B" ",18(B"
|
||||
-"o" ",1s(B" ",1v(B" ",1u(B" ",1r(B" ",1w(B"
|
||||
-",1t(B" ",1/(B" ",11(B" ",12(B" ",10(B" ",15(B"
|
||||
-",1=(B" ",1>(B" ",17(B" ",1^(B" ",16(B" ",1~(B"
|
||||
-"u" ",1z(B" ",1|(B" ",1{(B" ",1y(B" ",1x(B"
|
||||
-",1_(B" ",1Q(B" ",1X(B" ",1f(B" ",1W(B" ",1q(B"
|
||||
-"y" ",1}(B" ",1V(B" ",1[(B" ",1O(B" ",1\(B"
|
||||
-
|
||||
-"A" ",2`(B" ",2d(B" ",2c(B" ",2a(B" ",2U(B"
|
||||
-",2e(B" ",2"(B" ",2F(B" ",2G(B" ",2!(B" ",2#(B"
|
||||
-",2b(B" ",2%(B" ",2&(B" ",2g(B" ",2$(B" ",2'(B"
|
||||
-"E" ",2h(B" ",2k(B" ",2((B" ",2i(B" ",2)(B"
|
||||
-",2j(B" ",2+(B" ",2,(B" ",2-(B" ",2*(B" ",2.(B"
|
||||
-"I" ",2l(B" ",2o(B" ",2n(B" ",2m(B" ",28(B"
|
||||
-"O" ",2r(B" ",2v(B" ",2u(B" ",2s(B" ",2w(B"
|
||||
-",2t(B" ",20(B" ",21(B" ",22(B" ",2/(B" ",25(B"
|
||||
-",2=(B" ",26(B" ",27(B" ",2^(B" ",2>(B" ",2~(B"
|
||||
-"U" ",2y(B" ",2|(B" ",2{(B" ",2z(B" ",2x(B"
|
||||
-",2_(B" ",2W(B" ",2X(B" ",2f(B" ",2Q(B" ",2q(B"
|
||||
-"Y" ",2O(B" ",2V(B" ",2[(B" ",2}(B" ",2\(B"
|
||||
-
|
||||
-",2p(B" ",1p(B"
|
||||
diff -Ndu ../tamago-4.0.6/egg.el ./egg.el
|
||||
--- ../tamago-4.0.6/egg.el Mon Jan 17 09:36:17 2000
|
||||
+++ ./egg.el
|
||||
+++ ./egg.el Sun Jan 28 03:53:13 2001
|
||||
@@ -33,10 +33,11 @@
|
||||
(require 'cl)
|
||||
(require 'egg-edep)
|
||||
|
|
@ -1126,10 +1693,9 @@ diff -u -3 ../tamago-4.0.6/egg.el ./egg.el
|
|||
|
||||
(defun egg-mark-modification (beg end)
|
||||
(if (and (null egg-suppress-marking)
|
||||
Only in ../tamago-4.0.6: egg.el.orig
|
||||
diff -u -3 ../tamago-4.0.6/eggrc ./eggrc
|
||||
diff -Ndu ../tamago-4.0.6/eggrc ./eggrc
|
||||
--- ../tamago-4.0.6/eggrc Tue Jan 4 15:50:44 2000
|
||||
+++ ./eggrc
|
||||
+++ ./eggrc Sun Jan 28 03:53:13 2001
|
||||
@@ -1,4 +1,4 @@
|
||||
-;;; eggrc --- EGG Input Method Startup File
|
||||
+;;; eggrc --- EGG Input Method Startup File -*- emacs-lisp -*-
|
||||
|
|
@ -1146,23 +1712,22 @@ diff -u -3 ../tamago-4.0.6/eggrc ./eggrc
|
|||
+ ((eq egg-backend-type 'canna)
|
||||
|
||||
- (sj3-setsysdic "sj3main.dic")
|
||||
-
|
||||
- (sj3-setusrdic "private.dic")
|
||||
- (sj3-setusrstdy "study.dat")))
|
||||
+ (canna-define-environment)
|
||||
+ (canna-add-dict "iroha" nil)
|
||||
+ (canna-add-dict "fuzokugo" nil)
|
||||
+ (canna-add-dict "hojomwd" nil)
|
||||
+ (canna-add-dict "hojoswd" nil)
|
||||
+ (canna-add-dict "user" t)
|
||||
+
|
||||
|
||||
- (sj3-setusrdic "private.dic")
|
||||
- (sj3-setusrstdy "study.dat")))
|
||||
+ (canna-define-environment "Bushu" 0 t)
|
||||
+ (canna-add-dict "bushu" nil))
|
||||
+ )
|
||||
Common subdirectories: ../tamago-4.0.6/its and ./its
|
||||
diff -u -3 ../tamago-4.0.6/its-keydef.el ./its-keydef.el
|
||||
diff -Ndu ../tamago-4.0.6/its-keydef.el ./its-keydef.el
|
||||
--- ../tamago-4.0.6/its-keydef.el Wed Jan 5 13:43:30 2000
|
||||
+++ ./its-keydef.el
|
||||
+++ ./its-keydef.el Sun Jan 28 03:53:13 2001
|
||||
@@ -70,7 +70,7 @@
|
||||
((its-in-fence-p)
|
||||
(its-input-end)
|
||||
|
|
@ -1172,9 +1737,9 @@ diff -u -3 ../tamago-4.0.6/its-keydef.el ./its-keydef.el
|
|||
(egg-exit-conversion)))
|
||||
(setq its-current-select-func func
|
||||
its-current-map ',map
|
||||
diff -u -3 ../tamago-4.0.6/its.el ./its.el
|
||||
diff -Ndu ../tamago-4.0.6/its.el ./its.el
|
||||
--- ../tamago-4.0.6/its.el Mon Jan 17 09:36:17 2000
|
||||
+++ ./its.el
|
||||
+++ ./its.el Sun Jan 28 03:53:13 2001
|
||||
@@ -35,7 +35,7 @@
|
||||
(require 'egg-edep)
|
||||
|
||||
|
|
@ -1663,10 +2228,9 @@ diff -u -3 ../tamago-4.0.6/its.el ./its.el
|
|||
|
||||
(defun its-mode ()
|
||||
"\\{its-mode-map}"
|
||||
Only in .: jisx0213.el
|
||||
diff -u -3 ../tamago-4.0.6/leim-list.el ./leim-list.el
|
||||
diff -Ndu ../tamago-4.0.6/leim-list.el ./leim-list.el
|
||||
--- ../tamago-4.0.6/leim-list.el Tue Jan 11 22:47:31 2000
|
||||
+++ ./leim-list.el
|
||||
+++ ./leim-list.el Sun Jan 28 03:53:13 2001
|
||||
@@ -32,8 +32,10 @@
|
||||
;;; Code:
|
||||
|
||||
|
|
@ -1708,9 +2272,9 @@ diff -u -3 ../tamago-4.0.6/leim-list.el ./leim-list.el
|
|||
|
||||
- )
|
||||
+ )
|
||||
diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
||||
diff -Ndu ../tamago-4.0.6/menudiag.el ./menudiag.el
|
||||
--- ../tamago-4.0.6/menudiag.el Tue Jan 4 15:53:49 2000
|
||||
+++ ./menudiag.el
|
||||
+++ ./menudiag.el Sun Jan 28 03:53:13 2001
|
||||
@@ -50,7 +50,7 @@
|
||||
;;
|
||||
|
||||
|
|
@ -1836,46 +2400,6 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
+(make-variable-buffer-local 'menudiag-pos-in-line)
|
||||
|
||||
(defun menudiag-follow-continuation ()
|
||||
- (interactive)
|
||||
- (let ((item (car menudiag-continuation)))
|
||||
- (setq menudiag-continuation (cdr menudiag-continuation))
|
||||
- (if menudiag-continuation
|
||||
- (setq unread-command-events (cons 'menudiag-continuation
|
||||
- unread-command-events)))
|
||||
- (if (eq item 'menudiag-list-all)
|
||||
- (menudiag-list-other-window)
|
||||
- (let ((in-loop t))
|
||||
- (while in-loop
|
||||
- (if (eq item (nth pos-in-line line))
|
||||
- (setq in-loop nil)
|
||||
- (menudiag-forward-item)
|
||||
- (if (and (= linepos 0) (= pos-in-line 0))
|
||||
- (error "no such item: %s" (menudiag-item-string item))))))
|
||||
- (let ((v (menudiag-item-value item)))
|
||||
- (if (menudiag-menu-p v)
|
||||
- (unwind-protect
|
||||
- (progn
|
||||
- (menudiag-select-internal v)
|
||||
- (menudiag-redraw))
|
||||
- (if (consp value)
|
||||
- (setq value (cons item value)))
|
||||
- (if done (menudiag-exit-minibuffer))))))))
|
||||
-
|
||||
-(defun menudiag-select-internal (menu)
|
||||
- (let* ((minibuf-prompt (nth 1 menu))
|
||||
- (current-items (nth 2 menu))
|
||||
- (selection-list
|
||||
- (menudiag-make-selection-list current-items
|
||||
- (- (window-width (minibuffer-window))
|
||||
- (string-width minibuf-prompt))))
|
||||
- (line (car selection-list))
|
||||
- (minibuf-contents
|
||||
- (menudiag-make-menu-formatted-string line)))
|
||||
- (let ((linepos 0)
|
||||
- (pos-in-line 0))
|
||||
- (read-from-minibuffer minibuf-prompt
|
||||
- (cons minibuf-contents 3)
|
||||
- menudiag-mode-map))))
|
||||
+ (let* ((item (car menudiag-continuation))
|
||||
+ (value (menudiag-item-value item))
|
||||
+ (pos (menudiag-search-item item)))
|
||||
|
|
@ -1923,7 +2447,30 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
+(make-variable-buffer-local 'menudiag-selection-list)
|
||||
+
|
||||
+(defun menudiag-minibuffer-hook ()
|
||||
+ (interactive)
|
||||
(interactive)
|
||||
- (let ((item (car menudiag-continuation)))
|
||||
- (setq menudiag-continuation (cdr menudiag-continuation))
|
||||
- (if menudiag-continuation
|
||||
- (setq unread-command-events (cons 'menudiag-continuation
|
||||
- unread-command-events)))
|
||||
- (if (eq item 'menudiag-list-all)
|
||||
- (menudiag-list-other-window)
|
||||
- (let ((in-loop t))
|
||||
- (while in-loop
|
||||
- (if (eq item (nth pos-in-line line))
|
||||
- (setq in-loop nil)
|
||||
- (menudiag-forward-item)
|
||||
- (if (and (= linepos 0) (= pos-in-line 0))
|
||||
- (error "no such item: %s" (menudiag-item-string item))))))
|
||||
- (let ((v (menudiag-item-value item)))
|
||||
- (if (menudiag-menu-p v)
|
||||
- (unwind-protect
|
||||
- (progn
|
||||
- (menudiag-select-internal v)
|
||||
- (menudiag-redraw))
|
||||
- (if (consp value)
|
||||
- (setq value (cons item value)))
|
||||
- (if done (menudiag-exit-minibuffer))))))))
|
||||
+ (remove-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
|
||||
+ (setq menudiag-minibuffer-list (cons (current-buffer)
|
||||
+ menudiag-minibuffer-list))
|
||||
|
|
@ -1934,7 +2481,22 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
+ (menudiag-follow-continuation))
|
||||
+ (when (and menudiag-show-all (null menudiag-done))
|
||||
+ (menudiag-list-other-window)))
|
||||
+
|
||||
|
||||
-(defun menudiag-select-internal (menu)
|
||||
- (let* ((minibuf-prompt (nth 1 menu))
|
||||
- (current-items (nth 2 menu))
|
||||
- (selection-list
|
||||
- (menudiag-make-selection-list current-items
|
||||
- (- (window-width (minibuffer-window))
|
||||
- (string-width minibuf-prompt))))
|
||||
- (line (car selection-list))
|
||||
- (minibuf-contents
|
||||
- (menudiag-make-menu-formatted-string line)))
|
||||
- (let ((linepos 0)
|
||||
- (pos-in-line 0))
|
||||
- (read-from-minibuffer minibuf-prompt
|
||||
- (cons minibuf-contents 3)
|
||||
- menudiag-mode-map))))
|
||||
+(defun menudiag-select-internal (menu all &optional continuation)
|
||||
+ (menudiag-send-variables-with-value
|
||||
+ menudiag-value menudiag-value
|
||||
|
|
@ -2042,7 +2604,10 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
- (menudiag-goto-line 0)
|
||||
- (menudiag-goto-line (1+ linepos)))
|
||||
- (menudiag-beginning-of-line)))
|
||||
-
|
||||
+(defun menudiag-forward-item (n)
|
||||
+ (interactive "p")
|
||||
+ (menudiag-forward-item-internal n))
|
||||
|
||||
-(defun menudiag-backward-item ()
|
||||
- (interactive)
|
||||
- (if (< 0 pos-in-line)
|
||||
|
|
@ -2051,10 +2616,6 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
- (menudiag-goto-line (1- (length selection-list)))
|
||||
- (menudiag-goto-line (1- linepos)))
|
||||
- (menudiag-end-of-line)))
|
||||
+(defun menudiag-forward-item (n)
|
||||
+ (interactive "p")
|
||||
+ (menudiag-forward-item-internal n))
|
||||
+
|
||||
+(defun menudiag-backward-item (n)
|
||||
+ (interactive "p")
|
||||
+ (menudiag-forward-item-internal (- n)))
|
||||
|
|
@ -2080,19 +2641,6 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
- linepos n)
|
||||
- (delete-region (point-min) (point-max))
|
||||
- (insert (menudiag-make-menu-formatted-string line)))
|
||||
-
|
||||
-(defun menudiag-next-line ()
|
||||
- (interactive)
|
||||
- (menudiag-goto-line (1+ linepos))
|
||||
- (if (< pos-in-line (length line))
|
||||
- (menudiag-goto-item-internal pos-in-line)
|
||||
- (menudiag-end-of-line)))
|
||||
-
|
||||
-(defun menudiag-previous-line ()
|
||||
- (interactive)
|
||||
- (menudiag-goto-line (1- linepos))
|
||||
- (if (< pos-in-line (length line))
|
||||
- (menudiag-goto-item-internal pos-in-line)
|
||||
+ (let ((len (length menudiag-selection-list)))
|
||||
+ (when (< n 0)
|
||||
+ (setq n (+ (% n len) len)))
|
||||
|
|
@ -2105,11 +2653,22 @@ diff -u -3 ../tamago-4.0.6/menudiag.el ./menudiag.el
|
|||
+ (insert menudiag-minibuf-prompt
|
||||
+ (menudiag-make-menu-formatted-string menudiag-line))
|
||||
+ (set-text-properties (point-min) (point-max) '(read-only t)))))
|
||||
+
|
||||
|
||||
-(defun menudiag-next-line ()
|
||||
- (interactive)
|
||||
- (menudiag-goto-line (1+ linepos))
|
||||
- (if (< pos-in-line (length line))
|
||||
- (menudiag-goto-item-internal pos-in-line)
|
||||
- (menudiag-end-of-line)))
|
||||
+(defun menudiag-next-line (n)
|
||||
+ (interactive "p")
|
||||
+ (menudiag-next-line-internal n))
|
||||
+
|
||||
|
||||
-(defun menudiag-previous-line ()
|
||||
- (interactive)
|
||||
- (menudiag-goto-line (1- linepos))
|
||||
- (if (< pos-in-line (length line))
|
||||
- (menudiag-goto-item-internal pos-in-line)
|
||||
+(defun menudiag-previous-line (n)
|
||||
+ (interactive "p")
|
||||
+ (menudiag-next-line-internal (- n)))
|
||||
|
|
|
|||
Loading…
Reference in a new issue