From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 30 09:30:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0FEF9C8C for ; Sat, 30 Mar 2013 09:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E99B19AB for ; Sat, 30 Mar 2013 09:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2U9U01K091049 for ; Sat, 30 Mar 2013 09:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2U9U0np091048; Sat, 30 Mar 2013 09:30:00 GMT (envelope-from gnats) Resent-Date: Sat, 30 Mar 2013 09:30:00 GMT Resent-Message-Id: <201303300930.r2U9U0np091048@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhiro KIMURA Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 13091B46 for ; Sat, 30 Mar 2013 09:23:17 +0000 (UTC) (envelope-from yasu@home.utahime.org) Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210]) by mx1.freebsd.org (Postfix) with ESMTP id 9AFE395E for ; Sat, 30 Mar 2013 09:23:16 +0000 (UTC) Received: from eastasia.home.utahime.org (mail.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id B172661FC3; Sat, 30 Mar 2013 18:23:08 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 848434E635; Sat, 30 Mar 2013 18:23:08 +0900 (JST) Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id 57DF54E634; Sat, 30 Mar 2013 18:23:08 +0900 (JST) Message-Id: <20130330092308.57DF54E634@eastasia.home.utahime.org> Date: Sat, 30 Mar 2013 18:23:08 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/177498: [PATCH] editors/tamago: fix runtime error and etc X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Mar 2013 09:30:01 -0000 >Number: 177498 >Category: ports >Synopsis: [PATCH] editors/tamago: fix runtime error and etc >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Mar 30 09:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Yasuhiro KIMURA >Release: FreeBSD 9.1-RELEASE-p1 amd64 >Organization: >Environment: System: FreeBSD xxxx 9.1-RELEASE-p1 FreeBSD 9.1-RELEASE-p1 #0 r246991: Wed Feb 20 04:01:53 JST 2013 xxxx amd64 >Description: - Fix runtime error on Emacs 24.3 by replacing removed 'last-command-char' with 'last-command-event'. - Add OPTIONS_DEFINE to Makefile so that options selection dialog is show up. - Simplify the application of FreeBSD patches by renaming files/post-patch-* into files/patch-*. Because this patch includes fix of runtime error, it should be committed before package build for 8.4-RELEASE. This patch includes that of ports/177374. So it should also closed afterthe close of this PR. >How-To-Repeat: >Fix: Attached patch should be applied with following commands: % cd /usr/ports/editors/tamago % svn move files/post-patch-egg-wnn.el files/patch-egg-wnn.el % svn move files/post-patch-egg-wnnrpc.el files/patch-egg-wnnrpc.el % svn move files/post-patch-egg.el files/patch-egg.el % svn move files/post-patch-menudiag.el files/patch-menudiag.el % svn patch /somewhere/saved/dir/patch-tamago --- patch-tamago begins here --- Index: Makefile =================================================================== --- Makefile (revision 315600) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg @@ -32,6 +32,8 @@ POSTPATCHES= ${FILESDIR}/post-patch-* +OPTIONS_DEFINE= DOCS + .include .if ${EMACS_PORT_NAME} == emacs21 || ${EMACS_PORT_NAME} == emacs22 || ${EMACS_PORT_NAME} == emacs23 || ${EMACS_PORT_NAME} == emacs24 @@ -44,9 +46,6 @@ @${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \ ${WRKSRC}/configure -post-patch: - cd ${PATCH_WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH} - post-build: cd ${WRKSRC}/helper && ${MAKE} egg-helper ${INSTALL_DATA} ${WRKSRC}/debian/changelog ${WRKSRC}/changelog.Debian Index: files/patch-egg.el =================================================================== --- files/patch-egg.el (working copy) +++ files/patch-egg.el (working copy) @@ -1,5 +1,5 @@ ---- egg.el.orig 2012-08-04 09:27:19.000000000 +0900 -+++ egg.el 2012-08-04 09:32:15.000000000 +0900 +--- egg.el.orig 2013-03-30 17:08:47.000000000 +0900 ++++ egg.el 2013-03-30 17:11:22.000000000 +0900 @@ -169,7 +169,8 @@ (setq egg-modeless-mode t)) (setq inactivate-current-input-method-function 'egg-mode) @@ -10,3 +10,12 @@ (add-hook 'input-method-activate-hook 'its-set-mode-line-title nil t) (if (eq (selected-window) (minibuffer-window)) (add-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer)) +@@ -184,7 +185,7 @@ + + (defun egg-self-insert-char () + (interactive) +- (its-start last-command-char (and (eq last-command 'egg-use-context) ++ (its-start last-command-event (and (eq last-command 'egg-use-context) + egg-context))) + + (defun egg-remove-all-text-properties (from to &optional object) Index: files/patch-its.el =================================================================== --- files/patch-its.el (revision 0) +++ files/patch-its.el (working copy) @@ -0,0 +1,20 @@ +--- its.el.orig 2002-08-02 12:07:34.000000000 +0900 ++++ its.el 2013-03-30 17:11:53.000000000 +0900 +@@ -397,7 +397,7 @@ + (defun its-self-insert-char () + (interactive) + (let ((inhibit-read-only t) +- (key last-command-char) ++ (key last-command-event) + (cursor (get-text-property (point) 'its-cursor)) + (syl (get-text-property (1- (point)) 'its-syl))) + (cond +@@ -1264,7 +1264,7 @@ + (interactive "P") + (let ((syl (and (null (get-text-property (point) 'its-cursor)) + (get-text-property (1- (point)) 'its-syl)))) +- (if (its-keyseq-acceptable-p (vector last-command-char) syl) ++ (if (its-keyseq-acceptable-p (vector last-command-event) syl) + (its-self-insert-char) + (its-kick-convert-region n)))) + Index: files/patch-menudiag.el =================================================================== --- files/patch-menudiag.el (working copy) +++ files/patch-menudiag.el (working copy) @@ -1,5 +1,14 @@ --- menudiag.el.orig 2001-01-28 03:53:13.000000000 +0900 -+++ menudiag.el 2012-08-04 09:32:34.000000000 +0900 ++++ menudiag.el 2013-03-30 17:12:23.000000000 +0900 +@@ -296,7 +296,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 @@ (make-local-variable 'inhibit-read-only) (setq buffer-read-only t @@ -10,3 +19,12 @@ (add-hook 'post-command-hook 'menudiag-selection-align-to-item nil t) (use-local-map menudiag-selection-map) (setq mode-name "Menudiag Selection") +@@ -619,7 +620,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)) + --- patch-tamago ends here --- >Release-Note: >Audit-Trail: >Unformatted: