From: Robert Pluim Date: Thu, 16 Feb 2023 12:04:53 +0000 (+0100) Subject: Rename 'emacs-news-toggle-tag' to 'emacs-news-cycle-tag' X-Git-Tag: emacs-29.0.90~426^2~3 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83af806ab7cce7f9d9e184410a9c6921aa5de936;p=emacs.git Rename 'emacs-news-toggle-tag' to 'emacs-news-cycle-tag' * lisp/textmodes/emacs-news-mode.el (emacs-news-cycle-tag): Renamed from 'emacs-news-toggle-tag'. (emacs-news-mode-map, emacs-news-mode-menu): Use new name. * test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts: Renamed from "toggle-tag.erts". * test/lisp/textmodes/emacs-news-mode-tests.el (emacs-news-cycle-tag): Rename test from 'emacs-news-toggle-tag', and call 'emacs-news-cycle-tag' with new resource file name. --- diff --git a/lisp/textmodes/emacs-news-mode.el b/lisp/textmodes/emacs-news-mode.el index c6efb4fe7ca..c5e7b8f4bc6 100644 --- a/lisp/textmodes/emacs-news-mode.el +++ b/lisp/textmodes/emacs-news-mode.el @@ -53,7 +53,7 @@ :parent emacs-news-common-map "C-c C-s" #'emacs-news-next-untagged-entry "C-c C-r" #'emacs-news-previous-untagged-entry - "C-c C-t" #'emacs-news-toggle-tag + "C-c C-t" #'emacs-news-cycle-tag "C-c C-d" #'emacs-news-delete-temporary-markers "C-c C-g" #'emacs-news-goto-section "C-c C-j" #'emacs-news-find-heading @@ -67,7 +67,7 @@ ["Next Untagged" emacs-news-next-untagged-entry :help "Go to next untagged entry"] ["Previous Untagged" emacs-news-previous-untagged-entry :help "Go to previous untagged entry"] ["Count Untagged" emacs-news-count-untagged-entries :help "Count the number of untagged entries"] - ["Toggle Tag" emacs-news-toggle-tag :help "Toggle documentation tag of current entry"] + ["Cycle Tag" emacs-news-cycle-tag :help "Cycle documentation tag of current entry"] ["Delete Tags" emacs-news-delete-temporary-markers :help "Delete all documentation tags in buffer"] "--" ["Goto Section" emacs-news-goto-section :help "Prompt for section and go to it"] @@ -188,8 +188,8 @@ untagged NEWS entry." (interactive nil emacs-news-mode) (emacs-news-next-untagged-entry t)) -(defun emacs-news-toggle-tag () - "Toggle documentation tag of current headline in the Emacs NEWS file." +(defun emacs-news-cycle-tag () + "Cycle documentation tag of current headline in the Emacs NEWS file." (interactive nil emacs-news-mode) (save-excursion (goto-char (line-beginning-position)) @@ -206,7 +206,7 @@ untagged NEWS entry." (insert "+++")) ((looking-at (rx bol "+++" eol)) (delete-char 4)) - (t (user-error "Invalid headline tag; can't toggle"))))) + (t (user-error "Invalid headline tag; can't cycle"))))) (defun emacs-news-count-untagged-entries () "Say how many untagged entries there are in the current NEWS buffer." diff --git a/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts b/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts new file mode 100644 index 00000000000..63c3b1b7d8a --- /dev/null +++ b/test/lisp/textmodes/emacs-news-mode-resources/cycle-tag.erts @@ -0,0 +1,131 @@ +Name: tag1 +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 with 'dired-x'. +=-= ++++ +*** '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 with 'dired-x'. +=-=-= + +Name: tag2 +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: tag3 +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: tag4-point-at-headline +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: tag5-point-at-tag +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: tag6-point-at-tag +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. +=-=-= diff --git a/test/lisp/textmodes/emacs-news-mode-resources/toggle-tag.erts b/test/lisp/textmodes/emacs-news-mode-resources/toggle-tag.erts deleted file mode 100644 index 63c3b1b7d8a..00000000000 --- a/test/lisp/textmodes/emacs-news-mode-resources/toggle-tag.erts +++ /dev/null @@ -1,131 +0,0 @@ -Name: tag1 -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 with 'dired-x'. -=-= -+++ -*** '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 with 'dired-x'. -=-=-= - -Name: tag2 -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: tag3 -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: tag4-point-at-headline -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: tag5-point-at-tag -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: tag6-point-at-tag -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. -=-=-= diff --git a/test/lisp/textmodes/emacs-news-mode-tests.el b/test/lisp/textmodes/emacs-news-mode-tests.el index e1152265a45..676a3270da6 100644 --- a/test/lisp/textmodes/emacs-news-mode-tests.el +++ b/test/lisp/textmodes/emacs-news-mode-tests.el @@ -23,10 +23,10 @@ (require 'ert-x) (require 'emacs-news-mode) -(ert-deftest emacs-news-toggle-tag () - (ert-test-erts-file (ert-resource-file "toggle-tag.erts") +(ert-deftest emacs-news-cycle-tag () + (ert-test-erts-file (ert-resource-file "cycle-tag.erts") (lambda () (emacs-news-mode) - (emacs-news-toggle-tag)))) + (emacs-news-cycle-tag)))) ;;; emacs-news-mode-tests.el ends here