[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 6e38a4b 17/20: Merge branch 'master' of http:
|
From: |
Robert Weiner |
|
Subject: |
[elpa] externals/hyperbole 6e38a4b 17/20: Merge branch 'master' of http://git.savannah.gnu.org/r/hyperbole into externals/hyperbole. |
|
Date: |
Tue, 9 Aug 2016 19:17:09 +0000 (UTC) |
branch: externals/hyperbole
commit 6e38a4b9bcb443d98adb08f781cd1a1032057d74
Merge: 72833c9 275331f
Author: Bob Weiner <address@hidden>
Commit: Bob Weiner <address@hidden>
Merge branch 'master' of http://git.savannah.gnu.org/r/hyperbole into
externals/hyperbole.
Updated Makefile.
---
Makefile | 16 ++++++++++++----
man/hyperbole.html | 18 +++++++++++++++---
man/hyperbole.info | Bin 436228 -> 436710 bytes
man/hyperbole.pdf | Bin 798465 -> 798585 bytes
4 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index a668fed..185cfcb 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ ELC_KOTL = kotl/kexport.elc kotl/kfile.elc kotl/kfill.elc
kotl/kimport.elc kotl/
kotl/kprop-xe.elc kotl/kview.el kotl/kvspec.elc
HYPERBOLE_FILES = dir hyperbole-pkg.el info html $(EL_SRC) $(EL_COMPILE)
$(EL_KOTL) \
- $(ELC_COMPILE) ChangeLog COPYING Makefile HY-ABOUT HY-ANNOUNCE HY-NEWS \
+ $(ELC_COMPILE) Changes COPYING Makefile HY-ABOUT HY-ANNOUNCE HY-NEWS \
HY-WHY.kotl INSTALL DEMO MANIFEST README _hypb .hypb file-newer
smart-clib-sym \
hyperbole-banner.png $(man_dir)/hkey-help.txt \
$(man_dir)/hyperbole.texi $(man_dir)/version.texi
@@ -255,17 +255,25 @@ $(man_dir)/hyperbole.pdf: $(man_dir)/hyperbole.texi
$(man_dir)/version.texi $(ma
# Generate a Hyperbole package suitable for distribution via the Emacs package
manager.
pkg: package
-package: doc kotl/kotl-loaddefs.el $(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.sig
+package: git-pull doc kotl/kotl-loaddefs.el
$(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.sig
# Generate and distribute a Hyperbole release to GNU ELPA and ftp.gnu.org.
# One step in this is to generate an autoloads file for the Koutliner,
kotl/kotl-loaddefs.el.
-release: package $(pkg_dir)/hyperbole-$(hypb_version).tar.gz elpa ftp
+release: package git-push $(pkg_dir)/hyperbole-$(hypb_version).tar.gz elpa ftp
+ @ echo; echo "Hyperbole $(HYPB_VERSION) released to elpa and
ftp.gnu.org successfully."
+
+# Ensure local hyperbole directory is synchronized with master before building
a release.
+git-pull:
+ git pull
+git-push:
+ git push
# Once the release version number is updated in hyperbole.el and the release
is pushed to
# git, ELPA will automatically check and build its Hyperbole archive, allowing
users to
# update their packages of Hyperbole. ELPA does this twice a day now.
elpa: package
- git tag -s hyperbole-$(HYPB_VERSION) && git push
+ cd ../elpa/package/hyperbole && git pull
http://git.savannah.gnu.org/r/hyperbole.git master \
+ && git tag -s hyperbole-$(HYPB_VERSION) && git push
# Send compressed tarball for uploading to GNU ftp site; this must be done
from the directory
# containing the tarball to upload.
diff --git a/man/hyperbole.html b/man/hyperbole.html
index 2cfe7c8..6b4e9be 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
<!-- This manual is for GNU Hyperbole
-(Edition 6.0.2, Published August 8, 2016).
+(Edition 6.0.2, Published August 9, 2016).
Copyright (C) 1989-2016 Free Software Foundation, Inc.
@@ -322,7 +322,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
<PRE>
Edition 6.0.2
-Printed August 8, 2016.
+Printed August 9, 2016.
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -734,7 +734,7 @@ Next: <a href="#Buttons" accesskey="n"
rel="next">Buttons</a>, Previous: <a href
<h2 class="chapter">1 Introduction</h2>
<p>This edition of the GNU Hyperbole Manual is for use with any version
-6.01 or greater of GNU Hyperbole. Hyperbole runs atop GNU Emacs 24.3
+6.0.2 or greater of GNU Hyperbole. Hyperbole runs atop GNU Emacs 24.3
or higher. It will trigger an error if your Emacs is older.
</p>
<p>This chapter summarizes the structure of the rest of the manual,
@@ -1974,6 +1974,15 @@ Returns ‘<samp>t</samp>’ if found,
‘<samp>nil</samp>’ if
<dt><code>link-to-texinfo-node</code></dt>
<dd><p>Displays the Texinfo node with NODENAME (a string) from the current
buffer.
</p>
+<a name="index-actypes-link_002dto_002dweb_002dsearch"></a>
+<a name="index-link_002c-web-search"></a>
+<a name="index-web-search-link"></a>
+</dd>
+<dt><code>link-to-web-search</code></dt>
+<dd><p>Searches web SERVICE-NAME for SEARCH-TERM. Uses
<code>hyperbole-web-search-alist</code>
+to match each service to its search url. Uses
<code>hyperbole-web-search-browser-function</code>
+and the <code>browse-url</code> package to display search results.
+</p>
<a name="index-actypes-man_002dshow"></a>
<a name="index-sm_002dnotify"></a>
</dd>
@@ -10620,6 +10629,7 @@ Next: <a href="#Concept-Index" accesskey="n"
rel="next">Concept Index</a>, Previ
<tr><td></td><td valign="top"><a
href="#index-actypes-link_002dto_002drfc"><code>actypes
link-to-rfc</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-actypes-link_002dto_002dstring_002dmatch"><code>actypes
link-to-string-match</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-actypes-link_002dto_002dtexinfo_002dnode"><code>actypes
link-to-texinfo-node</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-actypes-link_002dto_002dweb_002dsearch"><code>actypes
link-to-web-search</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-actypes-man_002dshow"><code>actypes
man-show</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-actypes-rfc_002dtoc"><code>actypes
rfc-toc</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-actypes-text_002dtoc"><code>actypes
text-toc</code></a>:</td><td> </td><td valign="top"><a
href="#Action-Types">Action Types</a></td></tr>
@@ -11622,6 +11632,7 @@ Previous: <a href="#Function" accesskey="p"
rel="prev">Function</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-link_002c-pathname">link,
pathname</a>:</td><td> </td><td valign="top"><a
href="#Implicit-Buttons">Implicit Buttons</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-link_002c-pathname-line-and-column">link, pathname line and
column</a>:</td><td> </td><td valign="top"><a
href="#Implicit-Buttons">Implicit Buttons</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-link_002c-viewer-program">link,
viewer program</a>:</td><td> </td><td valign="top"><a
href="#External-Viewers">External Viewers</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-link_002c-web-search">link, web
search</a>:</td><td> </td><td valign="top"><a href="#Action-Types">Action
Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-linking_002c-in_002dplace">linking,
in-place</a>:</td><td> </td><td valign="top"><a
href="#Explicit-Buttons">Explicit Buttons</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-Lisp-variables">Lisp
variables</a>:</td><td> </td><td valign="top"><a
href="#Link-Variable-Substitution">Link Variable Substitution</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-list">list</a>:</td><td> </td><td valign="top"><a
href="#Thing-Selection">Thing Selection</a></td></tr>
@@ -12016,6 +12027,7 @@ Previous: <a href="#Function" accesskey="p"
rel="prev">Function</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-wconfig-commands">wconfig
commands</a>:</td><td> </td><td valign="top"><a
href="#Window-Configurations">Window Configurations</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-web-pages_002c-displaying">web
pages, displaying</a>:</td><td> </td><td valign="top"><a
href="#Using-URLs-with-Find_002dFile">Using URLs with Find-File</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-web-search">web
search</a>:</td><td> </td><td valign="top"><a
href="#Menus">Menus</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-web-search-link">web search
link</a>:</td><td> </td><td valign="top"><a href="#Action-Types">Action
Types</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-web-search-menu">web search
menu</a>:</td><td> </td><td valign="top"><a href="#Web-Search-Engines">Web
Search Engines</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-web-search-menu-1">web search
menu</a>:</td><td> </td><td valign="top"><a
href="#Global-Key-Bindings">Global Key Bindings</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-window-configuration-commands">window configuration
commands</a>:</td><td> </td><td valign="top"><a
href="#Window-Configurations">Window Configurations</a></td></tr>
diff --git a/man/hyperbole.info b/man/hyperbole.info
index 80f16e5..b88ba83 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index 1a7fda6..0dda22d 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
- [elpa] externals/hyperbole updated (81e8485 -> df14034), Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole b0724a8 18/20: Updates to release, package and elpa targets., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 5ae3550 03/20: * hactypes.el (exec-shell-cmd): Replaced call to old function 'show-output-from-shell', Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole fbee779 10/20: Minor hibtypes.el edit., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 3174664 11/20: Fixed misnamed reference to hpath:file-suffix-regexp., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole e28b8bf 02/20: * HY-ANNOUNCE (About):, Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 6e38a4b 17/20: Merge branch 'master' of http://git.savannah.gnu.org/r/hyperbole into externals/hyperbole.,
Robert Weiner <=
- [elpa] externals/hyperbole ab16a35 06/20: * Changes: Renamed this file from ChangeLog since Elpa release builds, Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole a2b8a90 04/20: * hyperbole.el: Updated the header fields to better match GNU standards for use, Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 7e1675e 05/20: * README.md: Added menu images and screenshots for easy access., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 275331f 16/20: Updated package, release and elpa targets., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 390a976 01/20: * hload-path.el (hyperb:dir): If the Emacs Package Manager has already added this, Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole df14034 20/20: Merge branch 'master' of http://git.savannah.gnu.org/r/hyperbole into externals/hyperbole, Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 12651d8 19/20: Upcased mistyped HYPB_VERSION in release target., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole ad7a089 13/20: * hys-org.el (defib org-mode, org-mode:help): Ensured trigger only in org-mode and simplified logic., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 77a075f 07/20: * README.md.html - Added., Robert Weiner, 2016/08/09
- [elpa] externals/hyperbole 71b8e73 08/20: 2016-08-05 Bob Weiner <address@hidden>, Robert Weiner, 2016/08/09