Add short form option '-P' for '--no-pager'

Fixes #606

Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>

Author: xdelaruelle

NEWS.rst

@@ -56,6 +56,8 @@ Modules 5.7.0 (not yet released)
   level. (fix issue #592)
 * Add :option:`-p` option as an abbreviated form for :option:`--paginate`.
   (fix issue #593)
+* Add :option:`-P` option as an abbreviated form for :option:`--no-pager`.
+  (fix issue #606)
 
 
 .. _5.6 release notes:

doc/source/changes.rst

@@ -845,7 +845,7 @@ The following command line switches appeared on Modules 5.
 +------------+-----------------------------------------------------------------+
 | 5.6        | :option:`--dumpname`                                            |
 +------------+-----------------------------------------------------------------+
-| 5.7        | :option:`-p`                                                    |
+| 5.7        | :option:`-p`, :option:`-P`                                      |
 +------------+-----------------------------------------------------------------+
 
 :option:`--output`

doc/source/module.rst

@@ -467,14 +467,17 @@ switches are accepted:
     .. versionchanged:: 5.6
        Support for :subcmd:`spider` sub-command added
 
-.. option:: --no-pager
+.. option:: --no-pager, -P
 
  Do not pipe message output into a pager.
 
  .. only:: html or latex
 
     .. versionadded:: 4.1
 
+    .. versionchanged:: 5.7
+       Short form option :option:`-P` added
+
 .. option:: --no-redirect
 
  Do not send message output to stdout. Keep it on stderr.

init/Makefile

@@ -120,7 +120,7 @@ endif
 # define variables for shell completion
 comp_cmds := add add-any apropos aliases avail append-path cachebuild cacheclear clear config del describe disable display edit help initadd initclear initlist initprepend initrm is-loaded is-saved is-used is-avail info-loaded keyword lint list load load-any mod-to-sh path paths purge prepend-path refresh reload reset restore rm remove remove-path save savelist saveshow saverm search show sh-to-mod source spider stash stashclear stashlist stashpop stashrm stashshow state swap switch test try-add try-load unload unuse update use whatis
 comp_long_opts := --debug --dumpname --help --silent --trace --verbose --version --paginate --no-pager --color --color= --width --width= --ignore-cache --ignore-user-rc
-comp_opts := -D -h -s -T -v -V -p -w $(comp_long_opts)
+comp_opts := -D -h -s -T -v -V -p -P -w $(comp_long_opts)
 comp_load_opts := --auto --no-auto --force -f --icase -i --tag --tag=
 comp_unload_opts := --auto --no-auto --force -f --icase -i
 comp_list_opts := -a -j -l -o -t --all --json --long --output --output= --terse

init/fish_completion

@@ -171,7 +171,7 @@ complete -c module -s C -l contains --description 'Search modules whose name con
 complete -c module -l indepth --description 'Perform recursive avail search'
 complete -c module -l no-indepth --description 'Perform non-recursive avail search'
 complete -c module -s p -l paginate --description 'Pipe mesg output into a pager if stream attached to terminal'
-complete -c module -l no-pager --description 'Do not pipe message output into a pager'
+complete -c module -s P -l no-pager --description 'Do not pipe message output into a pager'
 complete -c module -l auto --description 'Enable automated module handling mode'
 complete -c module -l no-auto --description 'Disable automated module handling mode'
 complete -c module -s f -l force --description 'By-pass dependency consistency or confirmation dialog'

init/zsh-functions/_module.in

@@ -130,7 +130,7 @@ _module() {
       '--dumpname[Module implementation name]' \
       '(-w --width=)'{-w,--width=}'[Set output width]' \
       '(-p --paginate)'{-p,--paginate}'[Pipe mesg output into a pager if stream attached to terminal]' \
-      '--no-pager[Do not pipe message output into a pager]' \
+      '(-P --no-pager)'{-P,--no-pager}'[Do not pipe message output into a pager]' \
       '(--color --color=)'{--color,--color=}'[Colorize the output]' \
       '--ignore-cache[Ignore module cache]' \
       '--ignore-user-rc[Skip evaluation of user-specific module rc file]' \

tcl/main.tcl.in

@@ -705,7 +705,7 @@ if {[catch {
             -p - --paginate {
                set asked_paginate 1
             }
-            --no-pager {
+            -P - --no-pager {
                set asked_paginate 0
             }
             --redirect {

tcl/report.tcl.in

@@ -2170,7 +2170,7 @@ Options:
   -s | --silent   Turn off error, warning and informational messages
   --timer         Report execution times
   -p | --paginate Pipe mesg output into a pager if stream attached to terminal
-  --no-pager      Do not pipe message output into a pager
+  -P | --no-pager Do not pipe message output into a pager
   --redirect      Send output to stdout (only for sh, bash, ksh, zsh and fish)
   --no-redirect   Send output to stderr
   --color[=WHEN]  Colorize the output; WHEN can be 'always' (default if

testsuite/modules.00-init/100-pager.exp

@@ -122,7 +122,7 @@ if {$verbose} {
 set env(LESS) $opts
 pager_test_case "" $pager_dfl_use "-" $install_pager $install_pageropts
 pager_test_case "-p" $pager_dfl_use "1" $install_pager $install_pageropts
-pager_test_case "--no-pager" 0 "0" $install_pager $install_pageropts
+pager_test_case "-P" 0 "0" $install_pager $install_pageropts
 
 set opts ""
 if {$verbose} {
@@ -157,7 +157,7 @@ if {$verbose} {
 set env(PAGER) $cmd
 pager_test_case "" $pager_dfl_use "-" $install_pager $install_pageropts
 pager_test_case "-p" $pager_dfl_use "1" $install_pager $install_pageropts
-pager_test_case "--no-pager" 0 "0" $install_pager $install_pageropts
+pager_test_case "-P" 0 "0" $install_pager $install_pageropts
 
 set cmd "cat"
 if {$verbose} {
@@ -184,7 +184,7 @@ if {$verbose} {
 set env(PAGER) $cmd
 pager_test_case "" $pager_dfl_use "-" $install_pager $install_pageropts
 pager_test_case "-p" $pager_dfl_use "1" $install_pager $install_pageropts
-pager_test_case "--no-pager" 0 "0" $install_pager $install_pageropts
+pager_test_case "-P" 0 "0" $install_pager $install_pageropts
 
 set cmd "/usr/bin/less"
 if {$verbose} {
@@ -233,7 +233,7 @@ if {$verbose} {
 set env(MODULES_PAGER) $cmd
 pager_test_case "" 0 "-" $cmd ""
 pager_test_case "-p" 0 "1" $cmd ""
-pager_test_case "--no-pager" 0 "0" $cmd ""
+pager_test_case "-P" 0 "0" $cmd ""
 
 set cmd "cat"
 if {$verbose} {
@@ -260,7 +260,7 @@ if {$verbose} {
 unset env(PAGER)
 pager_test_case "" 1 "-" $cmd $opts
 pager_test_case "-p" 1 "1" $cmd $opts
-pager_test_case "--no-pager" 0 "0" $cmd $opts
+pager_test_case "-P" 0 "0" $cmd $opts
 
 if {$verbose} {
     send_user "\tSetup LESS = '-K'\n"
@@ -280,7 +280,7 @@ if {$verbose} {
 set env(MODULES_PAGER) $cmd
 pager_test_case "" 1 "-" $cmd $opts
 pager_test_case "-p" 1 "1" $cmd $opts
-pager_test_case "--no-pager" 0 "0" $cmd $opts
+pager_test_case "-P" 0 "0" $cmd $opts
 
 
 # test activation depending on selected shell