[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     9d4c7c5b1bccd719decad755537fafc457fd4cfc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 16:21:20 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May  2 16:21:20 2024 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=9d4c7c5b

Drop the -n, --nocolor, --nocolour option

* emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
option, which is deprecated since version 1.11 released in 2013.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog     | 3 +++
 emacs-updater | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6323e0c..702a3de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2024-05-02  Ulrich Müller  <ulm@gentoo.org>
 
+	* emacs-updater (OPTIONS): Drop the -n, --nocolor, --nocolour
+	option, which is deprecated since version 1.11 released in 2013.
+
 	* emacs-updater (COLOUR): Respect the NO_COLOR environment
 	variable.
 

diff --git a/emacs-updater b/emacs-updater
index 34fd89b..4c4dc8a 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -107,9 +107,9 @@ pm_auto() {
 }
 
 # Read in all command-line options and force English output
-OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmnopP: \
-    --long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
-    --long orphans,pretend,package-manager:,package-manager-command:,version \
+OPTIONS=$(LC_ALL=C "${GETOPT}" -o a:behmopP: \
+    --long action:,batch,color::,colour::,exact,help,major,orphans \
+    --long pretend,package-manager:,package-manager-command:,version \
     -n 'emacs-updater' -- "$@") \
     || usage $?
 
@@ -137,7 +137,6 @@ do
 	    esac
 	    shift 2
 	    ;;
-	-n|--nocolor|--nocolour) COLOUR="no"; shift ;; # legacy option
 	-a|--action)
 	    ACTIONS=
 	    for action in ${2/,/ }; do