Merge branch 'main' of tildegit.org:acdw/bollux

diff --git a/README.md b/README.md
index 40f05c9..bfa005a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -56,6 +56,9 @@ $ cd bollux
 # make install
 ```
 
+**NOTE** if you installed an older version, make sure to rm /usr/bin/bollux.  
+The new install path is /usr/local/bin.
+
 ## Alternative
 
 ```

diff --git a/bollux b/bollux
index 697447f..3f4d31f 100644 (file)
--- a/bollux
+++ b/bollux
@@ -123,8 +123,8 @@ bollux_config() {
        : "${BOLLUX_CONFIG:=${XDG_CONFIG_HOME:-$HOME/.config}/bollux/bollux.conf}"
 
        if [ -f "$BOLLUX_CONFIG" ]; then
-               # shellcheck disable=1090
                log debug "Loading config file '$BOLLUX_CONFIG'"
+               # shellcheck disable=1090
                . "$BOLLUX_CONFIG"
        else
                log debug "Can't load config file '$BOLLUX_CONFIG'."
@@ -146,7 +146,7 @@ bollux_config() {
        ## typesetting
        : "${T_MARGIN:=4}"                 # left and right margin
        : "${T_WIDTH:=0}"                  # width of the viewport -- 0 = get term width
-       : "${T_PRE_DISPLAY:=pre,alt,both}" # how to view PRE blocks
+       : "${T_PRE_DISPLAY:=both,pre,alt}" # how to view PRE blocks
        # colors -- these will be wrapped in \e[ __ m
        C_RESET='\e[0m'         # reset
        : "${C_SIGIL:=35}"      # sigil (=>, #, ##, ###, *, ```)
@@ -744,7 +744,7 @@ mklesskey() { # mklesskey FILENAME
                ] quit 3 # 51 forward
                r quit 4 # 52 re-request / download
                G quit 5 # 53 goto a url (pre-filled)
-               ` quit 6 # 54 cycle T_PRE_DISPLAY and refresh
+               p quit 6 # 54 cycle T_PRE_DISPLAY and refresh
                # other keybinds
                \40 forw-screen-force
                h left-scroll
@@ -1041,7 +1041,7 @@ extract_links() {
        local url alt
        local re="^=>[[:space:]]*([^[:space:]]+)([[:space:]]+(.*))?$"
        while read -r; do
-               log d $re
+               log d "$re"
                if [[ $REPLY =~ $re ]]; then
                        url="${BASH_REMATCH[1]}"
                        alt="${BASH_REMATCH[3]}"

diff --git a/bollux.1 b/bollux.1
index db965c5..35c93f5 100644 (file)
--- a/bollux.1
+++ b/bollux.1
@@ -56,7 +56,7 @@ goto a new URL - with current URL pre-filled
 .B r
 refresh the current page
 .TP
-.B `
+.B p
 cycle preformatted text visibility and refresh the current page
 .TP
 .B [

diff --git a/bollux.conf.5 b/bollux.conf.5
index b590397..b23aa62 100644 (file)
--- a/bollux.conf.5
+++ b/bollux.conf.5
@@ -94,7 +94,7 @@ If set to 0, attempts to use the width of the terminal,
 falling back to 80.
 .TP
 .BR T_PRE_DISPLAY
-comma-separated list of items; default is pre,alt,both.
+comma-separated list of items; default is both,pre,alt.
 .br
 How to display preformatted text blocks.
 .I pre