diff options
author | Charles Edward Pax <charles.pax@gmail.com> | 2017-07-29 13:29:26 -0400 |
---|---|---|
committer | Charles Edward Pax <charles.pax@gmail.com> | 2017-07-29 13:29:26 -0400 |
commit | 9c797713063ccbfca069bc65c284ce6a4a925c15 (patch) | |
tree | a3d9aa5c45a1b64ff84e9193c8f110b6dc94a756 /src | |
parent | 5da4a69978856b4fe3c5993b97525ddbbf991574 (diff) | |
parent | d76edd90b8635245478ab85cbf2fc14a3eec6e7c (diff) |
Merge remote-tracking branch 'origin/freeze' into doxygen
Diffstat (limited to 'src')
-rwxr-xr-x | src/Makefile | 14 | ||||
-rw-r--r-- | src/help.c | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index 82b3ea5..bc65db0 100755 --- a/src/Makefile +++ b/src/Makefile @@ -1,8 +1,8 @@ # Specify the name of the resulting executable file -name = sim +name = scim # The base directory where everything should be installed. -prefix = /usr/local/stow/sc-im +prefix = /usr/local EXDIR = $(prefix)/bin HELPDIR = $(prefix)/share/$(name) @@ -13,10 +13,10 @@ MANDIR = $(prefix)/share/man/man1 # Change these to your liking or use `make CC=gcc` etc #CC = cc -YACC = bison -y +#YACC = bison -y #SED = sed -LDLIBS += -lm -lncursesw -lzip -lxml2 +LDLIBS += -lm CFLAGS += -Wall -g CFLAGS += -DNCURSES @@ -26,7 +26,7 @@ CFLAGS += -DHELP_PATH=\"$(HELPDIR)\" CFLAGS += -DLIBDIR=\"$(LIBDIR)\" # Sets default pager, e.g. 'less' or 'more' -CFLAGS += -DDFLT_PAGER=\"pager\" +CFLAGS += -DDFLT_PAGER=\"less\" # Sets default editor. Its use in case EDITOR env variable is not set CFLAGS += -DDFLT_EDITOR=\"vim\" # Comment out to disable color support @@ -74,8 +74,8 @@ endif # NOTE: libxlsxwriter is required for xlsx file export support ifneq (,$(wildcard /usr/include/xlsxwriter.h)) -# CFLAGS += -DXLSX_EXPORT -# LDLIBS += -lxlsxwriter + CFLAGS += -DXLSX_EXPORT + LDLIBS += -lxlsxwriter endif # Check for gnuplot existance @@ -350,8 +350,12 @@ void find_word(char * word, char order) { int show_lines() { int lineno, i, k, key = 0, bold = 0 ; - for (lineno = 0; long_help[lineno + delta] && lineno < LINES - RESROW; lineno++) { - if (strlen(word_looked)) look_result = str_in_str(long_help[lineno + delta], word_looked); + for (lineno = 0; lineno + delta <= max && long_help[lineno + delta] && lineno < LINES - RESROW; lineno++) { + if (strlen(word_looked)) + look_result = + str_in_str( + long_help[lineno + delta], + word_looked); wmove(main_win, lineno, 0); wclrtoeol(main_win); |