From owner-svn-ports-all@FreeBSD.ORG Tue Apr 23 16:21:22 2013 Return-Path: Delivered-To: svn-ports-all@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 DA019D9A; Tue, 23 Apr 2013 16:21:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B94CC1ECC; Tue, 23 Apr 2013 16:21:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3NGLMRT096387; Tue, 23 Apr 2013 16:21:22 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3NGLMRq096384; Tue, 23 Apr 2013 16:21:22 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201304231621.r3NGLMRq096384@svn.freebsd.org> From: Hiroki Sato Date: Tue, 23 Apr 2013 16:21:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316369 - in head/editors/tamago: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 16:21:22 -0000 Author: hrs Date: Tue Apr 23 16:21:21 2013 New Revision: 316369 URL: http://svnweb.freebsd.org/changeset/ports/316369 Log: - Remove redundant lines and style clean-ups. - Fix (accept-process-output) to use (with-local-quit). - Replace (inactivate-current-input-method-function) with (deactivate-current-input-method-function). - Replace (inactivate-input-method) with (deactivate-input-method). Added: head/editors/tamago/files/patch-egg-com.el (contents, props changed) Modified: head/editors/tamago/Makefile head/editors/tamago/files/patch-egg.el Modified: head/editors/tamago/Makefile ============================================================================== --- head/editors/tamago/Makefile Tue Apr 23 16:08:35 2013 (r316368) +++ head/editors/tamago/Makefile Tue Apr 23 16:21:21 2013 (r316369) @@ -3,7 +3,7 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg @@ -24,8 +24,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_EMACS= yes WRKSRC= ${WRKDIR}/egg-4.0.6+0.20041122cvs -ELISPDIR= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp -PLIST_SUB= ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp" +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 @@ -33,7 +32,10 @@ OPTIONS_DEFINE= DOCS .include -.if ${EMACS_PORT_NAME} == emacs21 || ${EMACS_PORT_NAME} == emacs22 || ${EMACS_PORT_NAME} == emacs23 || ${EMACS_PORT_NAME} == emacs24 +.if ${EMACS_PORT_NAME} == emacs21 || \ + ${EMACS_PORT_NAME} == emacs22 || \ + ${EMACS_PORT_NAME} == emacs23 || \ + ${EMACS_PORT_NAME} == emacs24 PLIST_SUB+= HAS_JISX0213="" .else PLIST_SUB+= HAS_JISX0213="@comment " Added: head/editors/tamago/files/patch-egg-com.el ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-egg-com.el Tue Apr 23 16:21:21 2013 (r316369) @@ -0,0 +1,32 @@ +--- egg-com.el.orig 2013-04-23 16:10:35.000000000 +0900 ++++ egg-com.el 2013-04-23 16:13:12.000000000 +0900 +@@ -828,9 +828,10 @@ + ;; Do not move the point, leave it where it was. + (defmacro comm-accept-process-output () + `(let ((p (point))) +- (if (null (accept-process-output proc comm-accept-timeout)) +- (egg-error "backend timeout (comm-accept-process-output)")) +- (goto-char p))) ++ (with-local-quit ++ (if (null (accept-process-output proc comm-accept-timeout)) ++ (egg-error "backend timeout (comm-accept-process-output)")) ++ (goto-char p)))) + + (defmacro comm-require-process-output (n) + `(if (< (point-max) (+ (point) ,n)) +@@ -839,10 +840,11 @@ + (defun comm-wait-for-space (proc n) + (let ((p (point)) + (r (+ (point) n))) +- (while (< (point-max) r) +- (if (null (accept-process-output proc comm-accept-timeout)) +- (egg-error "backend timeout (comm-wait-for-space)")) +- (goto-char p)))) ++ (with-local-quit ++ (while (< (point-max) r) ++ (if (null (accept-process-output proc comm-accept-timeout)) ++ (egg-error "backend timeout (comm-wait-for-space)")) ++ (goto-char p))))) + + (defmacro comm-following+forward-char () + `(prog1 Modified: head/editors/tamago/files/patch-egg.el ============================================================================== --- head/editors/tamago/files/patch-egg.el Tue Apr 23 16:08:35 2013 (r316368) +++ head/editors/tamago/files/patch-egg.el Tue Apr 23 16:21:21 2013 (r316369) @@ -1,8 +1,11 @@ ---- 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 @@ +--- egg.el.orig 2013-04-23 16:13:43.000000000 +0900 ++++ egg.el 2013-04-23 16:15:26.000000000 +0900 +@@ -167,16 +167,17 @@ + (setq egg-modefull-mode t) + (its-define-select-keys egg-modefull-map)) (setq egg-modeless-mode t)) - (setq inactivate-current-input-method-function 'egg-mode) +- (setq inactivate-current-input-method-function 'egg-mode) ++ (setq deactivate-current-input-method-function 'egg-mode) (setq describe-current-input-method-function 'egg-help) - (make-local-hook 'input-method-activate-hook) + (if (fboundp 'make-local-hook) @@ -10,6 +13,14 @@ (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)) + (run-hooks 'egg-mode-hook))) + + (defun egg-exit-from-minibuffer () +- (inactivate-input-method) ++ (deactivate-input-method) + (if (<= (minibuffer-depth) 1) + (remove-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer))) + @@ -184,7 +185,7 @@ (defun egg-self-insert-char ()