Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/teco/files/, app-emacs/teco/
Date: Tue, 01 Oct 2019 13:49:24
Message-Id: 1569937746.a293e636dead912e23744c594c4f805bbb6f7f31.ulm@gentoo
1 commit: a293e636dead912e23744c594c4f805bbb6f7f31
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 1 13:48:38 2019 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 1 13:49:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a293e636
7
8 app-emacs/teco: Fix old-style backquotes.
9
10 Closes: https://bugs.gentoo.org/684180
11 Package-Manager: Portage-2.3.76, Repoman-2.3.17
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 app-emacs/teco/files/teco-7-backquotes.patch | 34 ++++++++++++++++++++++++++++
15 app-emacs/teco/teco-7-r2.ebuild | 3 ++-
16 2 files changed, 36 insertions(+), 1 deletion(-)
17
18 diff --git a/app-emacs/teco/files/teco-7-backquotes.patch b/app-emacs/teco/files/teco-7-backquotes.patch
19 new file mode 100644
20 index 00000000000..b586812cf03
21 --- /dev/null
22 +++ b/app-emacs/teco/files/teco-7-backquotes.patch
23 @@ -0,0 +1,34 @@
24 +https://bugs.gentoo.org/684180
25 +
26 +--- a/teco.el
27 ++++ b/teco.el
28 +@@ -451,10 +451,10 @@
29 + and does
30 + (aset teco:exec-1 ?x 'teco:type-1-x)"
31 + (let ((s (intern (concat "teco:type-1-" (char-to-string char)))))
32 +- (` (progn
33 +- (defun (, s) ()
34 +- (,@ body))
35 +- (aset teco:exec-1 (, char) '(, s))))))
36 ++ `(progn
37 ++ (defun ,s ()
38 ++ ,@body)
39 ++ (aset teco:exec-1 ,char ',s))))
40 +
41 + (defmacro teco:define-type-2 (char &rest body)
42 + "Define the code to process a type 2 character.
43 +@@ -467,10 +467,10 @@
44 + and does
45 + (aset teco:exec-2 ?x 'teco:type-2-x)"
46 + (let ((s (intern (concat "teco:type-2-" (char-to-string char)))))
47 +- (` (progn
48 +- (defun (, s) ()
49 +- (,@ body))
50 +- (aset teco:exec-2 (, char) '(, s))))))
51 ++ `(progn
52 ++ (defun ,s ()
53 ++ ,@body)
54 ++ (aset teco:exec-2 ,char ',s))))
55 +
56 + (defconst teco:char-types (make-vector 256 0)
57 + "Define the characteristics of characters, as tested by \":
58
59 diff --git a/app-emacs/teco/teco-7-r2.ebuild b/app-emacs/teco/teco-7-r2.ebuild
60 index 921d8d072be..3fedca3d015 100644
61 --- a/app-emacs/teco/teco-7-r2.ebuild
62 +++ b/app-emacs/teco/teco-7-r2.ebuild
63 @@ -15,7 +15,8 @@ SLOT="0"
64 KEYWORDS="~amd64 ~x86"
65
66 PATCHES=("${FILESDIR}"/${P}-minibuffer-prompt.patch
67 - "${FILESDIR}"/${P}-emacs-24.patch)
68 + "${FILESDIR}"/${P}-emacs-24.patch
69 + "${FILESDIR}"/${P}-backquotes.patch)
70 SITEFILE="50${PN}-gentoo.el"
71 DOC_CONTENTS="To be able to invoke Teco directly, define a keybinding
72 for teco:command in your ~/.emacs file, e.g.: