diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2013-04-15 12:14:06 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2013-04-15 12:14:06 +0000 |
commit | b43fb3c17259a469b9af35984111fa36954f3670 (patch) | |
tree | b5ebf96288263f302b8565e9eeca1df70e3e6042 /editors/tamago | |
parent | Update to 449 because the old distfile was removed. (diff) |
- Rename obsolete symbol (s/last-command-char/last-command-event/) which
prevents it from working with Emacs 24.3.
- Minor style fixes.
Submitted by: Yasuhiro KIMURA
PR: ports/177498
Approved by: portmgr (bdrewery)
Notes
Notes:
svn path=/head/; revision=315801
Diffstat (limited to 'editors/tamago')
-rw-r--r-- | editors/tamago/Makefile | 8 | ||||
-rw-r--r-- | editors/tamago/files/patch-egg-wnn.el (renamed from editors/tamago/files/post-patch-egg-wnn.el) | 0 | ||||
-rw-r--r-- | editors/tamago/files/patch-egg-wnnrpc.el (renamed from editors/tamago/files/post-patch-egg-wnnrpc.el) | 0 | ||||
-rw-r--r-- | editors/tamago/files/patch-egg.el (renamed from editors/tamago/files/post-patch-egg.el) | 13 | ||||
-rw-r--r-- | editors/tamago/files/patch-its.el | 20 | ||||
-rw-r--r-- | editors/tamago/files/patch-menudiag.el | 30 | ||||
-rw-r--r-- | editors/tamago/files/post-patch-menudiag.el | 12 |
7 files changed, 63 insertions, 20 deletions
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 2120e8ab89cf..bfdabeb1affb 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -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 @@ -29,8 +29,7 @@ PLIST_SUB= ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp" PORTDOCS= AUTHORS ChangeLog ChangeLog.1997-1998 \ ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO \ README.Debian changelog.Debian - -POSTPATCHES= ${FILESDIR}/post-patch-* +OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> @@ -44,9 +43,6 @@ pre-configure: @${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 diff --git a/editors/tamago/files/post-patch-egg-wnn.el b/editors/tamago/files/patch-egg-wnn.el index 11c6de2c5799..11c6de2c5799 100644 --- a/editors/tamago/files/post-patch-egg-wnn.el +++ b/editors/tamago/files/patch-egg-wnn.el diff --git a/editors/tamago/files/post-patch-egg-wnnrpc.el b/editors/tamago/files/patch-egg-wnnrpc.el index e6730da755b1..e6730da755b1 100644 --- a/editors/tamago/files/post-patch-egg-wnnrpc.el +++ b/editors/tamago/files/patch-egg-wnnrpc.el diff --git a/editors/tamago/files/post-patch-egg.el b/editors/tamago/files/patch-egg.el index b22401031e04..af92d27123e4 100644 --- a/editors/tamago/files/post-patch-egg.el +++ b/editors/tamago/files/patch-egg.el @@ -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) diff --git a/editors/tamago/files/patch-its.el b/editors/tamago/files/patch-its.el new file mode 100644 index 000000000000..1b0f64c52811 --- /dev/null +++ b/editors/tamago/files/patch-its.el @@ -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)))) + diff --git a/editors/tamago/files/patch-menudiag.el b/editors/tamago/files/patch-menudiag.el new file mode 100644 index 000000000000..3e68fe59939c --- /dev/null +++ b/editors/tamago/files/patch-menudiag.el @@ -0,0 +1,30 @@ +--- menudiag.el.orig 2001-01-28 03:53:13.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 + 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") +@@ -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)) + diff --git a/editors/tamago/files/post-patch-menudiag.el b/editors/tamago/files/post-patch-menudiag.el deleted file mode 100644 index abae0c42cb3a..000000000000 --- a/editors/tamago/files/post-patch-menudiag.el +++ /dev/null @@ -1,12 +0,0 @@ ---- menudiag.el.orig 2001-01-28 03:53:13.000000000 +0900 -+++ menudiag.el 2012-08-04 09:32:34.000000000 +0900 -@@ -503,7 +503,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") |