Date: Thu, 29 Jan 2015 09:38:37 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378108 - in head/editors/tamago: . files Message-ID: <201501290938.t0T9cbm2013405@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Jan 29 09:38:37 2015 New Revision: 378108 URL: https://svnweb.freebsd.org/changeset/ports/378108 QAT: https://qat.redports.org/buildarchive/r378108/ Log: - Call override-local-map to set menudiag minibuffer keymap securely. This fixes "Text is read-only" error when a number is directly entered to select an entry. [*] - Deactivate input method when opening minibuffer for consistency. Reported by: ARAI Shun-ichi [*] Modified: head/editors/tamago/Makefile head/editors/tamago/files/patch-menudiag.el Modified: head/editors/tamago/Makefile ============================================================================== --- head/editors/tamago/Makefile Thu Jan 29 09:03:53 2015 (r378107) +++ head/editors/tamago/Makefile Thu Jan 29 09:38:37 2015 (r378108) @@ -3,7 +3,7 @@ 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 Modified: head/editors/tamago/files/patch-menudiag.el ============================================================================== --- head/editors/tamago/files/patch-menudiag.el Thu Jan 29 09:03:53 2015 (r378107) +++ head/editors/tamago/files/patch-menudiag.el Thu Jan 29 09:38:37 2015 (r378108) @@ -1,6 +1,25 @@ --- 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) @@ -9,7 +28,7 @@ (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) @@ -19,7 +38,7 @@ (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 @@ -32,7 +51,7 @@ (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)))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501290938.t0T9cbm2013405>