From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0KuWGiTduV5+SwAA0tVLHw (envelope-from ) for ; Mon, 11 May 2020 23:17:56 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id EJxfITLduV4oNgAA1q6Kng (envelope-from ) for ; Mon, 11 May 2020 23:18:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3EE71940E97 for ; Mon, 11 May 2020 23:18:07 +0000 (UTC) Received: from localhost ([::1]:42856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYHgU-0005Vv-Rh for larch@yhetil.org; Mon, 11 May 2020 19:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYHgQ-0005SN-Jr for guix-patches@gnu.org; Mon, 11 May 2020 19:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYHgQ-0006FC-Aa for guix-patches@gnu.org; Mon, 11 May 2020 19:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jYHgQ-0006hs-6u for guix-patches@gnu.org; Mon, 11 May 2020 19:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36751] [PATCH] gnu: Add emacs-hyperbole. Resent-From: Alex ter Weele Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 May 2020 23:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: swedebugia Cc: "LaFreniere, Joseph" , 36751@debbugs.gnu.org Received: via spool by 36751-submit@debbugs.gnu.org id=B36751.158923902625707 (code B ref 36751); Mon, 11 May 2020 23:18:02 +0000 Received: (at 36751) by debbugs.gnu.org; 11 May 2020 23:17:06 +0000 Received: from localhost ([127.0.0.1]:53613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYHfW-0006gY-1C for submit@debbugs.gnu.org; Mon, 11 May 2020 19:17:06 -0400 Received: from mail-qv1-f65.google.com ([209.85.219.65]:42149) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYHfT-0006fu-Ud for 36751@debbugs.gnu.org; Mon, 11 May 2020 19:17:04 -0400 Received: by mail-qv1-f65.google.com with SMTP id g20so2481202qvb.9 for <36751@debbugs.gnu.org>; Mon, 11 May 2020 16:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=fwi1k4e5/juAR8BVxVRCxmkpwVxWTu792RdB5/7D/K4=; b=Sc+CLkLbpjcd6d3iIs5kw603KAci0NjLH1OV80GtDYsOUfulkN0vajJug8HvowTLtD BjlxJhsmQW/EcdsPUAdZ8wK39cXiZoTNHjdL0UuQTmdwvl61BNjLdrv4+CObprNad3p6 5Fc1r2GyGTYGbdC1LC6CnLpPAxLO9TlvfR+nmSBAhcChdhL2nsZoylEDkuKDv07BHRqT W13xgm8IFVO6T4KEWxwUPjEf08+kFaHidvDosDRFxojm2cgaNxfYHUHMoQg6/5eN8O0+ J48A+eybFzl0HO+bRU/5nLTlj8KasWpBZQ3Sx6wLhndvPepDvEcIP8AmdVCEQ65PCy08 7bFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=fwi1k4e5/juAR8BVxVRCxmkpwVxWTu792RdB5/7D/K4=; b=lUcaFfKpTXcW3uYgcLjzrPzWUi9RmPu4rDW26Fv2wQarWdRqdtlp/IsGLWZ/Pgkviq P0Od60VNp0dDU5fbIotTdzEFeiTEqyTKERizwLWCFRbM4/LscklWR4tvw12urt5zcwCd BzmlcjrSmVqyr3lz/wm8cQID8Vy1CiYMar7Xws3Sbd8wxAvLmvqEP//ZP0uVy7Ik6T1V JErhrQNkl+vy9Njg+AZFhLvNF0D1syBZSGo8+Ue5+jzw9v5IZdFLSRP5h3G5jtopZYRW 1C2faW2TMdU0WOY5BYKkye9po/Szu3IfIdGqAgiq/evBTpYLmvwQ/MCHMYsmEHccBhzu iuuw== X-Gm-Message-State: AGi0PuZiDWp+JLp1QnEpUo45c66I2FTRSbVed8kdrVxj1Rf+0l/i17tM pkOmsDEKKACTXlC1Ci0rBA0tNfSg X-Google-Smtp-Source: APiQypJNnAjFsniw0qA837kBcGTNvYXgoeXZn4VMBGIGVREG7AtoPUMW1d1qfIG3terFAdpuLkWZ8Q== X-Received: by 2002:ad4:5624:: with SMTP id cb4mr12731349qvb.154.1589239017994; Mon, 11 May 2020 16:16:57 -0700 (PDT) Received: from librem (24.115.110.176.res-cmts.mlf.ptd.net. [24.115.110.176]) by smtp.gmail.com with ESMTPSA id d207sm9482865qkc.49.2020.05.11.16.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2020 16:16:57 -0700 (PDT) From: Alex ter Weele X-Google-Original-From: Alex ter Weele References: <875znv89iw.fsf@odyssey.lafreniere.xyz> <87a7d55q0w.fsf@odyssey.lafreniere.xyz> <877e7urii4.fsf@odyssey.lafreniere.xyz> Date: Mon, 11 May 2020 19:16:47 -0400 In-Reply-To: (swedebugia@riseup.net's message of "Tue, 6 Aug 2019 13:32:50 +0200") Message-ID: <878shyrrj4.fsf@librem.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 1.8 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 0.8 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 0.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=Sc+CLkLb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [0.09 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.54001679096556]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; R_DKIM_REJECT(1.00)[gmail.com:s=20161025]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; FREEMAIL_FROM(0.00)[gmail.com]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.07), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DKIM_TRACE(0.00)[gmail.com:-]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[24.115.110.176:received]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[alexterweele@gmail.com,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[riseup.net:email,gnu.org:url,lafreniere.xyz:email]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; PREVIOUSLY_DELIVERED(0.00)[36751@debbugs.gnu.org]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[209.51.188.17:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : SPF not aligned (relaxed),none] X-TUID: c66wcLeowieD --=-=-= Content-Type: text/plain Content-Transfer-Encoding: 8bit swedebugia writes: > Hi! > > Thanks for the patch. > > On 2019-08-03 06:16, LaFreniere, Joseph wrote: >> I have squashed the fixup into the original commit and rebased on >> current master (82ebb785f178d8618d39b658932d23d9f859fc91). The >> resulting commit is attached. >> >> >> -- Joseph LaFreniere > > Git said this: > > $ git apply 0001-gnu-Add-emacs-hyperbole.patch > 0001-gnu-Add-emacs-hyperbole.patch:122: space before tab in indent. >      (or (and (boundp 'user-mail-address) > 0001-gnu-Add-emacs-hyperbole.patch:123: trailing whitespace. > -- > 0001-gnu-Add-emacs-hyperbole.patch:149: trailing whitespace. > > 0001-gnu-Add-emacs-hyperbole.patch:155: space before tab in indent. >    (dname (or (and (boundp 'message-user-fqdn) > (stringp message-user-fqdn) > 0001-gnu-Add-emacs-hyperbole.patch:156: space before tab in indent. >        (string-match "\\." message-user-fqdn) > warning: squelched 10 whitespace errors > warning: 15 lines add whitespace errors. > > --- > > Could you take a look at that? I took a look at this. Regarding "trailing whitespace", I think those are generated with trailing whitespace in them, so I think it is normal that when adding .patch files to git that we'd see that message. Regarding "space before tab in indent", a mixture of tabs and spaces appears to be consistent with the Hyperbole codebase, so I think that's ok too. Attached is a patch that should apply against master. I have tested it a bit, by going through some of the Hyperbole demo. Things like Koutliner and Hycontrol seem to work, though I did not test all of Hyperbole's many features. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-emacs-hyperbole.patch Content-Transfer-Encoding: quoted-printable >From 96091af1de0ed8b91dc42e042ec9128c999d5016 Mon Sep 17 00:00:00 2001 From: "LaFreniere, Joseph" Date: Fri, 2 Aug 2019 23:16:19 -0500 Subject: [PATCH] gnu: Add emacs-hyperbole. * gnu/packages/emacs-xyz.scm (emacs-hyperbole): Add at 7.0.3 --- gnu/packages/emacs-xyz.scm | 68 +++++++++++++++ .../emacs-hyperbole-do-not-check-dir.patch | 24 ++++++ .../patches/emacs-hyperbole-domainname.patch | 29 +++++++ .../emacs-hyperbole-toggle-messaging.patch | 86 +++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 gnu/packages/patches/emacs-hyperbole-do-not-check-dir.p= atch create mode 100644 gnu/packages/patches/emacs-hyperbole-domainname.patch create mode 100644 gnu/packages/patches/emacs-hyperbole-toggle-messaging.p= atch diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c472958886..bd312c2f87 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -243,6 +243,74 @@ using geiser.") (license license:bsd-3) (home-page "https://github.com/xiaohanyu/ac-geiser")))) =20 +(define-public emacs-hyperbole + (package + (name "emacs-hyperbole") + (version "7.0.3") + (source (origin + (method url-fetch) + (uri (string-append + "http://ftpmirror.gnu.org/hyperbole/" + "hyperbole-" version ".tar.gz")) + (sha256 + (base32 + "0znsjhm0lmzpmkgfni4qzx4l6dp604bmrzp3mwxxax2v96wpwmcx")) + (patches + (search-patches + "emacs-hyperbole-do-not-check-dir.patch" + "emacs-hyperbole-domainname.patch" + "emacs-hyperbole-toggle-messaging.patch")))) + (build-system emacs-build-system) + (arguments + `(#:include '("DEMO" + "DEMO-ROLO.otl" + "HY-ABOUT" + "\\.el$" + "\\.info$" + "\\.kotl$") + #:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (propagated-inputs `(("inetutils" ,inetutils))) + (home-page "https://www.gnu.org/software/hyperbole/") + (synopsis "The Everyday Hypertextual Information Manager") + (description + "GNU Hyperbole, or just Hyperbole, is an easy-to-use, yet powerful and +programmable hypertextual information management system implemented as a G= NU +Emacs package. It offers rapid views and interlinking of all kinds of tex= tual +information, utilizing Emacs for editing. It can dramatically increase yo= ur +productivity and greatly reduce the number of keyboard/mouse keys you'll n= eed +to work efficiently. Hyperbole lets you: + +@itemize +@item Quickly create hyperlink buttons either from the keyboard or by drag= ging +between a source and destination window with a mouse button depressed. La= ter, +activate buttons by pressing/clicking on them or by giving the name of the +button. +@item Activate many kinds of \"implicit buttons\" recognized by context wi= thin +text buffers, e.g. URLs, grep output lines, and git commits. A single key= or +mouse button automatically does the right thing in dozens of contexts; just +press and go. +@item Build outlines with multi-level numbered outline nodes, e.g. 1.4.8.6, +that all renumber automatically as any node or tree is moved in the outlin= e. +Each node also has a permanent hyperlink anchor that you can reference from +any other node. +@item Manage all your contacts quickly with hierarchical categories and em= bed +hyperlinks within each entry. Or create an archive of documents with +hierarchical entries and use the same search mechanism to quickly find any +matching entry. +@item Use single keys to easily manage your Emacs windows or frames and +quickly retrieve saved window and frame configurations. +@item Search for things in your current buffers, in a directory tree or ac= ross +major web search engines with the touch of a few keys. +@end itemize + +The common thread in all these features is making retrieval, management and +display of information fast and easy. That is Hyperbole's purpose.") + (license license:gpl3+))) + (define-public emacs-paredit (package (name "emacs-paredit") diff --git a/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch b/= gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch new file mode 100644 index 0000000000..66c7a0fb08 --- /dev/null +++ b/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch @@ -0,0 +1,24 @@ +From 3016fbd61e47978be73bbbaf7a8c2709bec42066 Mon Sep 17 00:00:00 2001 +From: Joseph LaFreniere +Date: Fri, 12 Jul 2019 13:12:40 -0500 +Subject: [PATCH] Do not run hyperb:check-dir-user during initialization + +--- + hyperbole.el | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/hyperbole.el b/hyperbole.el +index 872dbaf..6edb2a7 100644 +--- a/hyperbole.el ++++ b/hyperbole.el +@@ -653,7 +653,6 @@ If FLAG is nil then text is shown, while if FLAG is t = the text is hidden." + (interactive) + (message "Initializing Hyperbole...") + (run-hooks 'hyperbole-init-hook) +- (hyperb:check-dir-user) + (or (stringp hyperb:user-email) + (setq hyperb:user-email + (or (and (boundp 'user-mail-address) +--=20 +2.22.0 + diff --git a/gnu/packages/patches/emacs-hyperbole-domainname.patch b/gnu/pa= ckages/patches/emacs-hyperbole-domainname.patch new file mode 100644 index 0000000000..cf4b63b54b --- /dev/null +++ b/gnu/packages/patches/emacs-hyperbole-domainname.patch @@ -0,0 +1,29 @@ +From 17c87ac58ce6d475fa1987347fcb868ef7f75e40 Mon Sep 17 00:00:00 2001 +From: Joseph LaFreniere +Date: Sun, 2 Jun 2019 12:38:27 -0500 +Subject: [PATCH] Replace executable domainname with hostname + +Fixes build failure: +> ice-9/boot-9.scm:752:25: In procedure dispatch-exception: +> patch-el-files: unable to locate "domainname" +--- + hypb.el | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/hypb.el b/hypb.el +index 6abc17a..0332946 100644 +--- a/hypb.el ++++ b/hypb.el +@@ -183,8 +183,7 @@ Global keymap is used unless optional KEYMAP is given." +=20 + (defun hypb:domain-name () + "Returns current Internet domain name with '@' prepended or nil if none= ." +- (let* ((dname-cmd (or (file-exists-p "/usr/bin/domainname") +- (file-exists-p "/bin/domainname"))) ++ (let* ((dname-cmd (file-exists-p "/bin/hostname")) + (dname (or (and (boundp 'message-user-fqdn) (stringp message-user-fqdn) + (string-match "\\." message-user-fqdn) + message-user-fqdn) +--=20 +2.21.0 + diff --git a/gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch b/= gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch new file mode 100644 index 0000000000..ab66e1b389 --- /dev/null +++ b/gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch @@ -0,0 +1,86 @@ +From 6d5c587ec719e3309077c7d637b03b13db65c047 Mon Sep 17 00:00:00 2001 +From: Joseph LaFreniere +Date: Fri, 12 Jul 2019 12:43:46 -0500 +Subject: [PATCH] Move definition of hyperbole-toggle-messaging to hsettings + +--- + hsettings.el | 25 +++++++++++++++++++++++++ + hyperbole.el | 26 -------------------------- + 2 files changed, 25 insertions(+), 26 deletions(-) + +diff --git a/hsettings.el b/hsettings.el +index 6cdd1b8..9632067 100644 +--- a/hsettings.el ++++ b/hsettings.el +@@ -163,6 +163,31 @@ package to display search results." + search-term))) + (user-error "(Hyperbole): Invalid web search service `%s'" service-= name)))) +=20 ++;;;###autoload ++(defun hyperbole-toggle-messaging (&optional arg) ++ "Toggle Hyperbole support for explicit buttons in mail and news buffers. ++Toggles the boolean variable `inhibit-hyperbole-messaging=E2=80=99 and ei= ther ++adds hooks (nil value) or removes them (t value). ++ ++With optional prefix ARG > 0, enables support. If ARG <=3D 0, ++disables/inhibits support." ++ (interactive "P") ++ (setq inhibit-hyperbole-messaging (if (null arg) ++ (not inhibit-hyperbole-messaging) ++ (<=3D (prefix-numeric-value arg) 0))) ++ (if inhibit-hyperbole-messaging ++ (var:remove-all) ++ (var:append-all) ++ ;; Add any hooks that were skipped when inhibit-hyperbole-messaging ++ ;; was nil. ++ (cond ((boundp 'hyperbole-loading)) ++ ((not after-init-time) ++ (add-hook 'after-init-hook (lambda () (load "hyperbole")))) ++ (t (load "hyperbole")))) ++ (if (called-interactively-p 'interactive) ++ (message "Hyperbole messaging button support is %s" ++ (if inhibit-hyperbole-messaging "disabled" "enabled")))) ++ + (defcustom inhibit-hyperbole-messaging t + "*Determines whether Hyperbole supports explicit buttons in mail and ne= ws buffers. + The default of t means disable such support (work remains to +diff --git a/hyperbole.el b/hyperbole.el +index 4aa427d..872dbaf 100644 +--- a/hyperbole.el ++++ b/hyperbole.el +@@ -121,32 +121,6 @@ + t))) + (error "(Hyperbole): Startup failure: `hyperb:dir' must be manually a= dded to `load-path' to fix."))) +=20 +-;; This must be defined before the defcustom `inhbit-hyperbole-messaging'. +-;;;###autoload +-(defun hyperbole-toggle-messaging (&optional arg) +- "Toggle Hyperbole support for explicit buttons in mail and news buffers. +-Toggles the boolean variable `inhibit-hyperbole-messaging=E2=80=99 and ei= ther +-adds hooks (nil value) or removes them (t value). +- +-With optional prefix ARG > 0, enables support. If ARG <=3D 0, +-disables/inhibits support." +- (interactive "P") +- (setq inhibit-hyperbole-messaging (if (null arg) +- (not inhibit-hyperbole-messaging) +- (<=3D (prefix-numeric-value arg) 0))) +- (if inhibit-hyperbole-messaging +- (var:remove-all) +- (var:append-all) +- ;; Add any hooks that were skipped when inhibit-hyperbole-messaging +- ;; was nil. +- (cond ((boundp 'hyperbole-loading)) +- ((not after-init-time) +- (add-hook 'after-init-hook (lambda () (load "hyperbole")))) +- (t (load "hyperbole")))) +- (if (called-interactively-p 'interactive) +- (message "Hyperbole messaging button support is %s" +- (if inhibit-hyperbole-messaging "disabled" "enabled")))) +- + (defgroup hyperbole-koutliner nil + "Hyperbole multi-level autonumbered outliner customizations." + :group 'hyperbole) +--=20 +2.22.0 + --=20 2.26.2 --=-=-= Content-Type: text/plain > > > Otherwise LGTM. > > (I linted it, inspected the output in the store with 'ls -lR' and > opened the info file) --=-=-=--