diff options
| author | Amjith Ramanujam <amjith.r@gmail.com> | 2022-08-26 06:27:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-26 06:27:55 -0700 |
| commit | abfb63651c69409ac8803c60a144917fd36935e6 (patch) | |
| tree | fe17bad10114f5c2ed2f4cfcd8338d137f2f4139 | |
| parent | 0c130bc327e69026c221f5ae601b240f9c659b5f (diff) | |
| parent | ba34257a0f02ea5d62412ba4c9d529cf38412397 (diff) | |
Merge branch 'main' into ssl-flag
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | mycli/AUTHORS | 1 | ||||
| -rwxr-xr-x | mycli/main.py | 5 | ||||
| -rw-r--r-- | mycli/myclirc | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/changelog.md b/changelog.md index bd8edbb..d79389b 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,10 @@ TBD Features: --------- + * Add `--ssl` flag to enable ssl/tls. +* Add `pager` option to `~/.myclirc`, for instance `pager = 'pspg --csv'` (Thanks: [BuonOmo]) + Internal: --------- @@ -894,6 +897,7 @@ Bug Fixes: [Amjith Ramanujam]: https://blog.amjith.com [Artem Bezsmertnyi]: https://github.com/mrdeathless +[BuonOmo]: https://github.com/BuonOmo [Carlos Afonso]: https://github.com/afonsocarlos [Casper Langemeijer]: https://github.com/langemeijer [Daniel West]: http://github.com/danieljwest diff --git a/mycli/AUTHORS b/mycli/AUTHORS index dd27686..a805465 100644 --- a/mycli/AUTHORS +++ b/mycli/AUTHORS @@ -24,6 +24,7 @@ Contributors: * Artem Bezsmertnyi * bitkeen * bjarnagin + * BuonOmo * caitinggui * Carlos Afonso * Casper Langemeijer diff --git a/mycli/main.py b/mycli/main.py index c3bc749..139ed34 100755 --- a/mycli/main.py +++ b/mycli/main.py @@ -938,8 +938,9 @@ class MyCli(object): os.environ['LESS'] = '-RXF' cnf = self.read_my_cnf_files(self.cnf_files, ['pager', 'skip-pager']) - if cnf['pager']: - special.set_pager(cnf['pager']) + cnf_pager = cnf['pager'] or self.config['main']['pager'] + if cnf_pager: + special.set_pager(cnf_pager) self.explicit_pager = True else: self.explicit_pager = False diff --git a/mycli/myclirc b/mycli/myclirc index ffd2226..cd58dfe 100644 --- a/mycli/myclirc +++ b/mycli/myclirc @@ -89,6 +89,9 @@ keyword_casing = auto # disabled pager on startup enable_pager = True +# Choose a specific pager +pager = 'less' + # Custom colors for the completion menu, toolbar, etc. [colors] completion-menu.completion.current = 'bg:#ffffff #000000' |