Index: head/editors/tamago/Makefile
===================================================================
--- head/editors/tamago/Makefile	(revision 378107)
+++ head/editors/tamago/Makefile	(revision 378108)
@@ -1,61 +1,61 @@
 # Created by: tetsushi NAKAI <nakai@tsl.pe.u-tokyo.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
 PATCHFILES=	egg_4.0.6+0.20041122cvs-19.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Egg V4, Multilingual Input Method for Emacsen
 
 LICENSE=	GPLv2
 
 USES=		gmake
 USE_EMACS=	yes
 POST_PATCHES=	${PATCHDIR}/post-patch-*
 WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
 PLIST_SUB=	ELISPDIR="${EMACS_VERSION_SITE_LISPDIR}"
 PORTDOCS=	AUTHORS ChangeLog ChangeLog.1997-1998 \
 		ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO \
 		README.Debian changelog.Debian
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${EMACS_PORT_NAME:Memacs2[1234]}
 PLIST_SUB+=	HAS_JISX0213=""
 .else
 PLIST_SUB+=	HAS_JISX0213="@comment "
 .endif
 
 post-patch:
 	cd ${PATCH_WRKSRC} && (${CAT} ${POST_PATCHES} | ${PATCH})
 
 post-build:
 	cd ${WRKSRC}/helper && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 	    ${_MAKE_JOBS} ${MAKE_ARGS} egg-helper
 	${INSTALL_DATA} ${WRKSRC}/debian/changelog ${WRKSRC}/changelog.Debian
 	${INSTALL_DATA} ${WRKSRC}/debian/README.Debian ${WRKSRC}
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper \
 	    ${STAGEDIR}${PREFIX}/bin/egg-helper
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/editors/tamago/files/patch-menudiag.el
===================================================================
--- head/editors/tamago/files/patch-menudiag.el	(revision 378107)
+++ head/editors/tamago/files/patch-menudiag.el	(revision 378108)
@@ -1,43 +1,62 @@
 --- menudiag.el.orig	2001-01-28 03:53:13.000000000 +0900
-+++ menudiag.el	2014-11-22 15:40:36.000000000 +0900
-@@ -296,7 +296,7 @@
++++ menudiag.el	2015-01-29 18:32:59.000000000 +0900
+@@ -226,6 +226,9 @@
+   (remove-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
+   (setq menudiag-minibuffer-list (cons (current-buffer)
+ 				       menudiag-minibuffer-list))
++  (if (boundp 'deactivate-input-method)
++    (deactivate-input-method)
++    (inactivate-input-method))
+   (buffer-disable-undo)
+   (menudiag-receive-variables)
+   (menudiag-beginning-of-items)
+@@ -248,7 +251,7 @@
+ 			       (string-width (cadr menu)))))
+   (add-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
+   (unwind-protect
+-      (progn
++      (let ((overriding-local-map menudiag-mode-map))
+ 	(read-from-minibuffer "" "" menudiag-mode-map)
+ 	(menudiag-receive-variables))
+     (setq menudiag-minibuffer-list (cdr menudiag-minibuffer-list))
+@@ -296,7 +299,7 @@
  (defun menudiag-goto-item ()
    (interactive)
    (menudiag-check-current-menu)
 -  (let ((ch last-command-char)
 +  (let ((ch last-command-event)
  	(n 0))
      (setq n (menudiag-char-to-item-num ch))
      (if (>= n (length menudiag-line))
-@@ -503,7 +503,8 @@
+@@ -503,7 +506,8 @@
    (make-local-variable 'inhibit-read-only)
    (setq buffer-read-only t
  	inhibit-read-only nil)
 -  (make-local-hook 'post-command-hook)
 +  (if (fboundp 'make-local-hook)
 +    (eval '(make-local-hook 'post-command-hook)))
    (add-hook 'post-command-hook 'menudiag-selection-align-to-item nil t)
    (use-local-map menudiag-selection-map)
    (setq mode-name "Menudiag Selection")
-@@ -595,10 +596,10 @@
+@@ -595,10 +599,10 @@
        (set-buffer sel-buf)
        (setq completion-reference-buffer tmp-buf)
        (if event
 -	  (mouse-choose-completion event)
 +         (choose-completion event)
  	(choose-completion))
        (set-buffer tmp-buf)
 -      (setq n (string-to-int (buffer-string))))
 +      (setq n (string-to-number (buffer-string))))
      (pop-to-buffer org-buf)
      (while (and item-list (>= n (length (car item-list))))
        (setq l (1+ l)
-@@ -619,7 +620,7 @@
+@@ -619,7 +623,7 @@
    (unless (eq last-command 'menudiag-selection-goto)
      (setq menudiag-goto-number-list nil
  	  menudiag-original-point (point)))
 -  (setq menudiag-goto-number-list (cons (- last-command-char ?0)
 +  (setq menudiag-goto-number-list (cons (- last-command-event ?0)
  					menudiag-goto-number-list))
    (menudiag-selection-goto-internal))