[elpa] externals/hyperbole a11877cfbc 4/7: Merge branch 'master' of hyperbole

[ELPA Syncer]

branch: externals/hyperbole
commit a11877cfbc27ee0568df7febe82e837281399e4a
Merge: e7c9598c78 6fb181ab69
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Merge branch 'master' of hyperbole
---
 ChangeLog                 | 25 +++++++++++++++++++++++++
 Makefile                  | 40 ++++++++++++++++++++++++++++------------
 hmail.el                  |  7 +++----
 hypb-maintenance.el       | 18 ++++++++++++++----
 test/kexport-tests.el     |  6 ++----
 test/kotl-mode-tests.el   | 23 +++++++++++++++++++----
 test/kotl-orgtbl-tests.el |  6 ++----
 test/smart-org-tests.el   |  6 ++----
 8 files changed, 95 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ead11db835..7fab3a869b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,31 @@
 * man/hyperbole.texi (Implicit Button Types): In org-mode description, use 
@smallexample instead
     of @group which was showing the markup in the Info file.
 
+2022-03-09  Mats Lidell  <matsl@gnu.org>
+
+* Makefile ($(pkg_dir)/hyperbole-$(HYPB_VERSION).tar): Package files under
+    source control, depend on version.
+    ($(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.sig): Remove sig-file just
+    before generation.
+    (git-pull): Ensure repository only contains master sources.
+
+2022-03-06  Mats Lidell  <matsl@gnu.org>
+
+* hmail.el (hmail:region): Insert kotl cell at the beginning of the mail
+    body. bug#44487 Suggestion by Jean Louis. Thanks Jean.
+
+2022-03-05  Mats Lidell  <matsl@gnu.org>
+
+* hypb-maintenance.el: Remove modified source buffers.
+
+2022-03-01  Mats Lidell  <matsl@gnu.org>
+
+* test/kotl-mode-tests.el (kotl-mode-hide-cell): Add test case.
+
+2022-02-27  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (web-site): Add target for preparing web site sources
+
 2022-02-27  Bob Weiner  <rsw@gnu.org>
 
 * hyrolo.el (hyrolo-map-level-1): Remove unused parameters and rename to 
'hyrolo-map-single-subtree'.
diff --git a/Makefile b/Makefile
index e1db4aca7f..e49865503f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     27-Feb-22 at 12:51:17 by Bob Weiner
+# Last-Mod:     12-Mar-22 at 15:08:16 by Bob Weiner
 #
 # Copyright (C) 1994-2021  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -42,6 +42,9 @@
 #               To release a Hyperbole Emacs package to ELPA and ftp.gnu.org:
 #                   make release
 #
+#              Generate the web site sources prepared for upload:
+#                  make web-site         - generate web site in folder 
$(HYPB_WEB_REPO_LOCATION)"
+#
 #               To setup Hyperbole to run directly from the latest test source
 #               code, use:
 #                    git clone http://git.savannah.gnu.org/r/hyperbole.git
@@ -146,6 +149,9 @@ pkg_hyperbole = $(pkg_dir)/hyperbole
 # Temp file to use to build .elc files.
 ELISP_TO_COMPILE = $(pkg_dir)/elc-${USER}
 
+# Path to dir where the web repository is located i.e. hypb:web-repo-location
+HYPB_WEB_REPO_LOCATION = "../hyweb/hyperbole/"
+
 ##########################################################################
 #                     NO CHANGES REQUIRED BELOW HERE.                    #
 ##########################################################################
@@ -229,6 +235,10 @@ help:
        @ echo "     make doc"
        @ echo "  To release a Hyperbole Emacs package to ELPA and ftp.gnu.org:"
        @ echo "     make release"
+       @ echo ""
+       @ echo "  Generate we site sources prepared for upload:"
+       @ echo "    make web-site         - generate web site in folder 
$(HYPB_WEB_REPO_LOCATION)"
+
        @ echo ""
        @ echo "The Hyperbole Manual is included in the package in four forms:"
        @ echo "    man/hyperbole.info    - GNU browsable version"
@@ -357,6 +367,14 @@ README.md.html: README.md
        md2html README.md -f -o - | sed - -e 
's/\(id="[^%]*\)\(%[A-Z0-9][A-Z0-9]\)/\1/g' -e 's/\(id="[^"]*"\)/\L\1/g' > 
README.md.html
        md2html README.md -f -o README.md.html
 
+# web-site maintenance: "https://www.gnu.org/software/hyperbole/";
+web-site:
+       $(EMACS_BATCH) --debug -l hypb-maintenance --eval '(let 
((hypb:web-repo-location $(HYPB_WEB_REPO_LOCATION))) (hypb:web-repo-update))'
+       @ echo
+       @ echo "Web site source created ..."
+       @ echo "Goto \"$(HYPB_WEB_REPO_LOCATION)\" and run \"cvs commit -m 
<comment>\" to upload it."
+       @ echo
+
 # Generate a Hyperbole package suitable for distribution via the Emacs package 
manager.
 pkg: package
 package: git-pull doc autoloads $(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.sig
@@ -368,7 +386,9 @@ release: package git-push 
$(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.gz elpa ftp
 
 # Ensure local hyperbole directory is synchronized with master before building 
a release.
 git-pull:
-       git pull
+       git checkout master && git pull
+       git diff-index --quiet master
+
 git-push:
        git push
 
@@ -401,20 +421,16 @@ $(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.gz:
        cd $(pkg_dir) && $(GZIP) hyperbole-$(HYPB_VERSION).tar > 
hyperbole-$(HYPB_VERSION).tar.gz
 
 $(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.sig: 
$(pkg_dir)/hyperbole-$(HYPB_VERSION).tar
+       $(RM) $(pkg_dir)/hyperbole-$(HYPB_VERSION).tar.sig
        cd $(pkg_dir) && $(GPG) -ba -o hyperbole-$(HYPB_VERSION).tar.sig 
hyperbole-$(HYPB_VERSION).tar
        @ echo; echo "Hyperbole package built successfully:"
        @ ls -l $(pkg_dir)/hyperbole-$(HYPB_VERSION).tar*
 
-$(pkg_dir)/hyperbole-$(HYPB_VERSION).tar: $(HYPERBOLE_FILES)
-       make version
-       cd $(pkg_dir) && $(RM) -fr $(pkg_hyperbole) 
$(pkg_hyperbole)-$(HYPB_VERSION)
-       cd .. && COPYFILE_DISABLE=1 $(TAR) -clf $(pkg_dir)/h.tar hyperbole
-       cd $(pkg_dir) && COPYFILE_DISABLE=1 $(TAR) xvf h.tar && cd 
$(pkg_hyperbole) && $(MAKE) packageclean
-       cd $(pkg_hyperbole) && make autoloads && chmod 755 topwin.py && \
-       cd $(pkg_dir) && $(RM) h.tar; \
-         mv $(pkg_hyperbole) $(pkg_hyperbole)-$(HYPB_VERSION) && \
-         COPYFILE_DISABLE=1 $(TAR) -clf 
$(pkg_dir)/hyperbole-$(HYPB_VERSION).tar hyperbole-$(HYPB_VERSION)
-       $(INSTALL) HY-ABOUT HY-ANNOUNCE HY-NEWS HY-WHY.kotl INSTALL README 
README.md README.html $(pkg_dir)/; chmod 644 $(pkg_dir)/*.tar
+$(pkg_dir)/hyperbole-$(HYPB_VERSION).tar: version $(HYPERBOLE_FILES)
+       $(RM) -fr $(pkg_hyperbole) $(pkg_hyperbole)-$(HYPB_VERSION).tar
+       git archive --format=tar --prefix=hyperbole-$(HYPB_VERSION)/ HEAD | (cd 
$(pkg_dir) && tar xf -)
+       cd $(pkg_hyperbole)-$(HYPB_VERSION) && make autoloads && chmod 755 
topwin.py
+       COPYFILE_DISABLE=1 $(TAR) -C $(pkg_dir) -clf 
$(pkg_hyperbole)-$(HYPB_VERSION).tar hyperbole-$(HYPB_VERSION)
 
 pkgclean: packageclean
 packageclean:
diff --git a/hmail.el b/hmail.el
index 2ae070aee0..4c059c5227 100644
--- a/hmail.el
+++ b/hmail.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     9-Oct-91 at 18:38:05
-;; Last-Mod:      5-Feb-22 at 17:59:17 by Bob Weiner
+;; Last-Mod:      6-Mar-22 at 22:29:00 by Mats Lidell
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the HY-COPY (Hyperbole) or BR-COPY (OO-Browser) file for license
@@ -211,9 +211,8 @@ buffer.  It may be a buffer or buffer name."
     (hmail:invoke)
     (setq mail-buf (current-buffer))
     (save-excursion
-      (when (search-forward mail-header-separator nil t)
-       ;; Within header, so move to body
-       (goto-char (point-max)))
+      (rfc822-goto-eoh)
+      (forward-line)
       (set-buffer buf)
       (hypb:insert-region mail-buf start end invisible-flag))))
 
diff --git a/hypb-maintenance.el b/hypb-maintenance.el
index 6eecec78c5..ac79b7a9ba 100644
--- a/hypb-maintenance.el
+++ b/hypb-maintenance.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    31-Mar-21 at 21:11:00
-;; Last-Mod:     27-Feb-22 at 10:14:34 by Bob Weiner
+;; Last-Mod:     12-Mar-22 at 15:14:34 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -82,12 +82,22 @@ Point `hypb:web-repo-location' to where the web repo is 
located."
        (kill-buffer))))
 
   ;; koutline-example.html
-  (kexport:html "kotl/EXAMPLE.kotl" (concat hypb:web-repo-location 
"koutline-example.html") nil)
+  (let ((example-src-name "kotl/EXAMPLE.kotl"))
+    (kexport:html example-src-name (concat hypb:web-repo-location 
"koutline-example.html") nil)
+    (with-current-buffer (get-file-buffer example-src-name)
+      (set-buffer-modified-p nil)
+      (kill-buffer)))
  
   ;; HY-WHY.html
-  (kexport:html "HY-WHY.kotl" (concat hypb:web-repo-location "HY-WHY.html") 
nil)
+  (let ((hy-why-src-name "HY-WHY.kotl"))
+    (kexport:html hy-why-src-name (concat hypb:web-repo-location 
"HY-WHY.html") nil)
+    (with-current-buffer (get-file-buffer hy-why-src-name)
+      (set-buffer-modified-p nil)
+      (kill-buffer))
+    (kexport:html hy-why-src-name (concat hypb:web-repo-location 
"HY-WHY.html") nil))
+
+  (message "Local copy of Hyperbole website updated successfully."))
 
-  (message "Local copy of Hyperbole webside updated successfully."))
 
 (provide 'hypb-maintenance)
 ;;; hypb-maintenance.el ends here
diff --git a/test/kexport-tests.el b/test/kexport-tests.el
index fd9375e1d0..30a977773e 100644
--- a/test/kexport-tests.el
+++ b/test/kexport-tests.el
@@ -1,13 +1,11 @@
 ;;; kexport-tests.el --- kexport tests            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021  Mats Lidell
-
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    10-Oct-21 at 17:30:00
-;; Last-Mod:      5-Feb-22 at 16:24:59 by Bob Weiner
+;; Last-Mod:      1-Mar-22 at 23:23:49 by Mats Lidell
 ;;
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
diff --git a/test/kotl-mode-tests.el b/test/kotl-mode-tests.el
index 5752a06100..a32183f3dc 100644
--- a/test/kotl-mode-tests.el
+++ b/test/kotl-mode-tests.el
@@ -1,13 +1,11 @@
 ;;; kotl-mode-tests.el --- kotl-mode-el tests            -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2021  Mats Lidell
-
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    18-May-21 at 22:14:10
-;; Last-Mod:      6-Feb-22 at 00:57:24 by Bob Weiner
+;; Last-Mod:      1-Mar-22 at 23:16:05 by Mats Lidell
 ;;
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -480,5 +478,22 @@
         (delete-file kotl-file)
         (delete-file new-name)))))
 
+(ert-deftest kotl-mode-hide-cell ()
+  "Verify cell is hidden and unhidden on `action-key' press."
+  (let ((kotl-file (make-temp-file "hypb" nil ".kotl")))
+    (unwind-protect
+        (progn
+          (find-file kotl-file)
+          (insert "1")
+          (kotl-mode:newline 1)
+          (insert "2")
+          (kotl-mode:beginning-of-buffer)
+          (action-key)                  ; Hide cell
+          (forward-char 1)
+          (should (outline-invisible-p))
+          (action-key)                  ; Unhide cell
+          (should-not (outline-invisible-p)))
+      (delete-file kotl-file))))
+
 (provide 'kotl-mode-tests)
 ;;; kotl-mode-tests.el ends here
diff --git a/test/kotl-orgtbl-tests.el b/test/kotl-orgtbl-tests.el
index d1eaebeed8..f23fe27562 100644
--- a/test/kotl-orgtbl-tests.el
+++ b/test/kotl-orgtbl-tests.el
@@ -1,13 +1,11 @@
 ;;; kotl-orgtbl-tests.el --- kotl orgtbl tests            -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2021  Mats Lidell
-
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:     2-Nov-21 at 17:04:30
-;; Last-Mod:      6-Feb-22 at 00:55:05 by Bob Weiner
+;; Last-Mod:      1-Mar-22 at 23:24:01 by Mats Lidell
 ;;
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
diff --git a/test/smart-org-tests.el b/test/smart-org-tests.el
index ed5ece0e69..e76197d1cf 100644
--- a/test/smart-org-tests.el
+++ b/test/smart-org-tests.el
@@ -1,13 +1,11 @@
 ;;; smart-org-tests.el --- smart-org-el tests            -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2021  Mats Lidell
-
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    23-Apr-21 at 22:21:00
-;; Last-Mod:      6-Feb-22 at 00:57:50 by Bob Weiner
+;; Last-Mod:      1-Mar-22 at 23:23:32 by Mats Lidell
 ;;
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.