fix #34849 "when egg-toroku-region, can not select menu by numbers"

* menudiag.el: fixed #34849 by Hiroki Sato <hrs@allbsd.org>
issue: when egg-toroku-region, can not select menu by numbers
https://sourceforge.jp/ticket/browse.php?group_id=9668&tid=34849
https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000037.html
patch:
https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000043.html
- added Hiroki Sato to copyright
* menudiag.el(menudiag-minibuffer-hook): added imput-method control
* menudiag.el(menudiag-select-internal): rebinded overriding-local-map
* menudiag.el: deleted Maintainer name

	modified:   ChangeLog
	modified:   NEWS
	modified:   menudiag.el

diff --git a/ChangeLog b/ChangeLog
index d12fcd9..bb7971a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,21 @@
 2015-01-29  Mitsutoshi NAKANO  <bkbin005@rinku.zaq.ne.jp>
 
-       * egg-sim.el(make-char-list):
+       * menudiag.el: fixed #34849 by Hiroki Sato <hrs@allbsd.org>
+       issue: when egg-toroku-region, can not select menu by numbers
+       https://sourceforge.jp/ticket/browse.php?group_id=9668&tid=34849
+       https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000037.html
+       patch:
+       https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000043.html
+       - added Hiroki Sato to copyright
+       * menudiag.el(menudiag-minibuffer-hook): added imput-method control
+       * menudiag.el(menudiag-select-internal): rebinded overriding-local-map
+       * menudiag.el: deleted Maintainer name
+       * egg-sim.el(make-char-list): rewrote ignore-errors in make char
        ARAI Shun-ichi <hermes@ceres.dti.ne.jp> wrote better fix.
        https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000036.html
        So Mitsutoshi rewrote.
        * egg-sim.el: added ARAI Shun-ichi <hermes@ceres.dti.ne.jp> to copyright
-       * NEWS(5.0.4.0): announced new sim.
+       * NEWS(5.0.4.0): announced new version
        * egg.el(egg-version): up from 5.0.2.0 to 5.0.4.0
        * egg.el: added Mitsutoshi to copyright
 

diff --git a/NEWS b/NEWS
index 9f0a567..cab3cf2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,21 @@
 NEWS about tamago-tsunagi
 =========================
 
-## 5.0.4.0 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp> rewrote sim.
+## 5.0.4.0 fixed 2 problems
+
+### Now, sim skips void chars in charsets
+
 ARAI Shun-ichi <hermes@ceres.dti.ne.jp> suggested better fix.
 https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000036.html
-So Mitsutoshi wewrote sim.
-Now, the sim skips void chars in the charsets.
+So Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp> rewrote sim.
+
+### fixed #34849  'when egg-toroku-region, can not select menu by numbers'
+
+Reported by ARAI Shun-ichi <hermes@ceres.dti.ne.jp>.
+https://sourceforge.jp/ticket/browse.php?group_id=9668&tid=34849
+https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000037.html
+Fixed by Hiroki Sato <hrs@allbsd.org>.
+https://sourceforge.jp/projects/tamago-tsunagi/lists/archive/misc/2015-January/000043.html
 
 ## 5.0.2.0 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
 

diff --git a/menudiag.el b/menudiag.el
index 2dcf108..5bbeead 100644 (file)
--- a/menudiag.el
+++ b/menudiag.el
@@ -1,11 +1,10 @@
 ;;; menudiag.el --- Minibuffer Menu System
 
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;; Copyright (C) 1999, 2000, 2015 Free Software Foundation, Inc
+;;               2015 Hiroki Sato <hrs@allbsd.org>
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 
-;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
-
 ;; Keywords: mule, multilingual, input method
 
 ;; This file is part of EGG.
@@ -226,6 +225,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 +250,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))