[nongnu] elpa/toc-org 752fe14c5b 042/128: fix "_1_org"-style suffixes

[ELPA Syncer]

branch: elpa/toc-org
commit 752fe14c5bf2b4085a702fa8441b0633ebe313f0
Author: Sergei Nosov <sergei.nosov@gmail.com>
Commit: Sergei Nosov <sergei.nosov@gmail.com>

    fix "_1_org"-style suffixes
---
 toc-org.el | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/toc-org.el b/toc-org.el
index ed5f3fc8c7..dc66b8d40f 100644
--- a/toc-org.el
+++ b/toc-org.el
@@ -94,7 +94,7 @@ tags."
 
       ;; don't include the TOC itself
       (goto-char (point-min))
-      (re-search-forward toc-org-toc-org-regexp)
+      (re-search-forward toc-org-toc-org-regexp nil t)
       (beginning-of-line)
       (delete-region (point) (progn (forward-line 1) (point)))
 
@@ -286,7 +286,8 @@ following tag formats:
         (when (re-search-forward toc-org-toc-org-regexp (point-max) t)
 
           ;; make toc visible
-          (org-show-entry)
+          (save-match-data
+            (org-show-entry))
 
           (let* ((tag (match-string 1))
                  (depth (if tag
@@ -299,7 +300,7 @@ following tag formats:
                  (hrefify (intern-soft hrefify-string)))
             (if hrefify
                 (progn
-                  (forward-line 1)
+                  (newline (forward-line 1))
 
                   ;; insert newline if TOC is currently empty
                   (when (looking-at "^\\*")
@@ -308,8 +309,8 @@ following tag formats:
                   ;; remove previous TOC
                   (delete-region (point)
                                  (save-excursion
-                                   (search-forward-regexp "^\\*" (point-max) 0)
-                                   (forward-line -1)
+                                   (when (search-forward-regexp "^\\*" 
(point-max) t)
+                                     (forward-line -1))
                                    (end-of-line)
                                    (point)))
 
@@ -335,6 +336,42 @@ following tag formats:
     (toc-org-insert-toc)
     (save-buffer)))
 
+(ert-deftest toc-org-test-insert-toc ()
+  "Test the `toc-org-insert-toc' function"
+
+  (defun toc-org-test-insert-toc-gold-test (content gold)
+    (with-temp-buffer
+      (org-mode)
+      (insert content)
+      (toc-org-raw-toc)
+      (toc-org-insert-toc)
+      (should (equal
+               (buffer-substring-no-properties
+                (point-min) (point-max))
+               gold))))
+  (declare-function toc-org-test-insert-toc-gold-test "toc-org") ;; suppress 
compiler warning
+
+  (let ((beg "* About\n:TOC:\n drawer\n:END:\n\ntoc-org is a utility to have 
an up-to-date table of contents in the\norg files without exporting (useful 
primarily for readme files on\nGitHub).\n\nIt is similar to the 
[[https://github.com/ardumont/markdown-toc][markdown-toc]] package, but works 
for org files.\n:TOC:\n  drawer\n:END:\n* Hello\n** Good-bye\n*** Salut\n* 
Table of Contents                                                     "))
+    (toc-org-test-insert-toc-gold-test
+     (concat beg ":TOC:")
+     "* About\n:TOC:\n drawer\n:END:\n\ntoc-org is a utility to have an 
up-to-date table of contents in the\norg files without exporting (useful 
primarily for readme files on\nGitHub).\n\nIt is similar to the 
[[https://github.com/ardumont/markdown-toc][markdown-toc]] package, but works 
for org files.\n:TOC:\n  drawer\n:END:\n* Hello\n** Good-bye\n*** Salut\n* 
Table of Contents                                                     :TOC:\n - 
[[#about][About]]\n - [[#hello][Hello]]\n     - [[ [...]
+
+    (toc-org-test-insert-toc-gold-test
+     (concat beg ":TOC_1:")
+     "* About\n:TOC:\n drawer\n:END:\n\ntoc-org is a utility to have an 
up-to-date table of contents in the\norg files without exporting (useful 
primarily for readme files on\nGitHub).\n\nIt is similar to the 
[[https://github.com/ardumont/markdown-toc][markdown-toc]] package, but works 
for org files.\n:TOC:\n  drawer\n:END:\n* Hello\n** Good-bye\n*** Salut\n* 
Table of Contents                                                     :TOC_1:\n 
- [[#about][About]]\n - [[#hello][Hello]]\n")
+
+    (toc-org-test-insert-toc-gold-test
+     (concat beg ":TOC_3:")
+     "* About\n:TOC:\n drawer\n:END:\n\ntoc-org is a utility to have an 
up-to-date table of contents in the\norg files without exporting (useful 
primarily for readme files on\nGitHub).\n\nIt is similar to the 
[[https://github.com/ardumont/markdown-toc][markdown-toc]] package, but works 
for org files.\n:TOC:\n  drawer\n:END:\n* Hello\n** Good-bye\n*** Salut\n* 
Table of Contents                                                     :TOC_3:\n 
- [[#about][About]]\n - [[#hello][Hello]]\n     -  [...]
+
+    (toc-org-test-insert-toc-gold-test
+     (concat beg ":TOC_1_org:")
+     "* About\n:TOC:\n drawer\n:END:\n\ntoc-org is a utility to have an 
up-to-date table of contents in the\norg files without exporting (useful 
primarily for readme files on\nGitHub).\n\nIt is similar to the 
[[https://github.com/ardumont/markdown-toc][markdown-toc]] package, but works 
for org files.\n:TOC:\n  drawer\n:END:\n* Hello\n** Good-bye\n*** Salut\n* 
Table of Contents                                                     
:TOC_1_org:\n - [[About][About]]\n - [[Hello][Hello]]\n")
+
+    (toc-org-test-insert-toc-gold-test
+     (concat beg ":TOC_3_org:")
+     "* About\n:TOC:\n drawer\n:END:\n\ntoc-org is a utility to have an 
up-to-date table of contents in the\norg files without exporting (useful 
primarily for readme files on\nGitHub).\n\nIt is similar to the 
[[https://github.com/ardumont/markdown-toc][markdown-toc]] package, but works 
for org files.\n:TOC:\n  drawer\n:END:\n* Hello\n** Good-bye\n*** Salut\n* 
Table of Contents                                                     
:TOC_3_org:\n - [[About][About]]\n - [[Hello][Hello]]\n      [...]
+
 ;; Local Variables:
 ;; compile-command: "emacs -batch -l ert -l *.el -f 
ert-run-tests-batch-and-exit && emacs -batch -f batch-byte-compile *.el 2>&1 | 
sed -n '/Warning\|Error/p' | xargs -r ls"
 ;; End: