From 1976ca1634d8c53a980299cb08778830cc7d90cf Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Tue, 21 Feb 2023 15:20:56 +0100 Subject: [PATCH] Make 'emacs-news-cycle-tag' work at all levels * lisp/textmodes/emacs-news-mode.el (emacs-news-cycle-tag): Search for a heading starting with 2 or more '*' rather than exactly 3. * test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts (Point-Char): Add tests for 2 and 4 '*' levels. --- lisp/textmodes/emacs-news-mode.el | 4 +- .../emacs-news-mode-resources/cycle-tag.erts | 89 +++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/lisp/textmodes/emacs-news-mode.el b/lisp/textmodes/emacs-news-mode.el index c5e7b8f4bc6..773b07764aa 100644 --- a/lisp/textmodes/emacs-news-mode.el +++ b/lisp/textmodes/emacs-news-mode.el @@ -195,7 +195,9 @@ untagged NEWS entry." (goto-char (line-beginning-position)) (cond ((or (looking-at (rx bol (or "---" "+++") eol))) (forward-line 2)) - ((or (looking-at (rx bol "*** "))) + ((or (looking-at (rx bol "**" + (zero-or-more "*") + " "))) (forward-line 1))) (outline-previous-visible-heading 1) (forward-line -1) diff --git a/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts b/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts index 63c3b1b7d8a..c3d32f6f05c 100644 --- a/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts +++ b/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts @@ -129,3 +129,92 @@ The corresponding key "% Y" is now bound by default in Dired. Before, that binding was only available if the 'dired-x' package was loaded. =-=-= + +Name: tag7-2level +Point-Char: | + +=-= ++++ +** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +|+++ +** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-= ++++ +** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +|** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-=-= + +Name: tag8-2level +Point-Char: | + +=-= ++++ +** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + ++++ +|** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-= ++++ +** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +|** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-=-= + +Name: tag9-2level-notag +Point-Char: | + +=-= ++++ +** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +|** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-= ++++ +** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +--- +|** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-=-= + + +Name: tag10-4level +Point-Char: | + +=-= ++++ +**** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +|**** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-= ++++ +**** 'dired-do-relsymlink-regexp' moved from dired-x to dired. +The corresponding key "% Y" is now bound by default in Dired. + +--- +|**** 'M-G' is now bound to 'dired-goto-subdir'. +Before, that binding was only available if the 'dired-x' package was +loaded. +=-=-= -- 2.39.2