Skip to content

Commit 9f4f025

Browse files
committed
Merge branch 'disable-scroll-offset'
* Branch commit log: lib/setup.sh: disable scroll offset in FZF (avoid confusing movememnts) Makefile.mk: installcheck: buffer manual page rendering Avoid 'col: write failed: Broken pipe' when checking man page via grep. Signed-off-by: Tim Janik <timj@gnu.org>
2 parents 5343cad + 8225370 commit 9f4f025

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Makefile.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ installcheck:
108108
$(QGEN)
109109
$Q $(DESTDIR)$(BINDIR)/jj-fzf --version >/dev/null \
110110
|| { echo "$@: ERROR: failed to start $(DESTDIR)$(BINDIR)/jj-fzf" >&2; false; }
111-
$Q man $(DESTDIR)$(PRJDIR)/doc/jj-fzf.1 | grep -qF jj-fzf \
111+
$Q man $(DESTDIR)$(PRJDIR)/doc/jj-fzf.1 > $@.tmp \
112+
&& grep -qF jj-fzf $@.tmp && rm -f $@.tmp \
112113
|| { echo "$@: ERROR: failed to render $(DESTDIR)$(PRJDIR)/doc/jj-fzf.1" >&2; false; }
113114
uninstall:
114115
$(QGEN)

lib/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ FZF_ARGS=(
451451
--info default
452452
--layout reverse-list
453453
--scrollbar '' # '▌'
454-
--scroll-off 2
454+
--scroll-off 0
455455
--highlight-line
456456
--preview-label-pos 2
457457
--input-label-pos 2

0 commit comments

Comments
 (0)