w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit 02a980fe2cdf5bffa01847e66b3594a155df072b
parent e0f57e997eb2b3d3b3f3ecea0d3aa80b0d0e5c8d
Author: ukai <ukai>
Date:   Fri, 23 Nov 2001 19:00:47 +0000

[w3m-dev 02526] new configure
From: Fumitoshi UKAI <ukai@debian.or.jp>

Diffstat:
M.cvsignore | 6++++++
MChangeLog | 21+++++++++++++++++++++
Mconfigure | 926++++++++++++++++++++++++++++++++++++++-----------------------------------------
Mdisplay.c | 4++--
Mdoc-jp/README.dict | 4++--
Mdoc/README.dict | 4++--
Mfm.h | 4++--
Mmain.c | 8++++----
Mproto.h | 6+++---
9 files changed, 483 insertions(+), 500 deletions(-)

diff --git a/.cvsignore b/.cvsignore @@ -5,3 +5,9 @@ funcname.c funcname1.h funcname2.h tagtable.c +inflate +mktable +w3m +w3mbookmark +w3mhelperpanel +_zdmachdep.c diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,24 @@ +2001-11-24 Fumitoshi UKAI <ukai@debian.or.jp> + + * [w3m-dev 02526] + * .cvsignore: add inflate mktable w3m w3mbookmark w3mhelperpanel + _zdmachdep.c + * configure: + pref_lang -> lang={JA|EN} + dcode -> display_code + scode -> system_code + remove save_params() + add def_param(), ask_choice() ask_param() + all confiration parameters can be read from config.param + s/DICT/USE_DICT/ + s/BUFINFO/USE_BUFINFO/ + * fm.h: s/DICT/USE_DICT/ + * proto.h: ditto + * doc/README.dict: ditto + * doc-jp/README.dict: ditto + * display.c: s/BUFINFO/USE_BUFINFO/ + * main.c: s/DICT/USE_DICT/ s/BUFINFO/USE_BUFINFO/ + 2001-11-24 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> * [w3m-dev 02523] diff --git a/configure b/configure @@ -55,11 +55,11 @@ do -prefix=*|--prefix=*) prefix=`expr "$1" : "-*prefix=\(.*\)"` ;; - -lang=en|--lang=en) - pref_lang=2 + -lang=en|--lang=en|-lang=EN|--lang=EN) + lang=EN ;; - -lang=ja|--lang=ja) - pref_lang=1 + -lang=ja|--lang=ja|-lang=ja|--lang=JA) + lang=JA ;; -model=baby|--model=baby) dmodel=1 @@ -80,7 +80,7 @@ do dmodel=6 ;; -code=*|--code=*) - def_dcode=`expr "$1" : "-*code=\(.*\)"` + dcode=`expr "$1" : "-*code=\(.*\)"` ;; -cflags=*|--cflags=*) dcflags=`echo $1 | sed -e 's/-*cflags=//'` @@ -98,7 +98,7 @@ do gc_libdir=`expr "$1" : "--gc-libdir=\(.*\)"` ;; --mimetypes=*) - mime_types=`expr "$1" : "--mimetypes=\(.*)\"` + mime_types=`expr "$1" : "--mimetypes=\(.*\)"` ;; -help|--help) @@ -212,15 +212,150 @@ yesno() { fi } -save_params() { - echo "use_color=$use_color" >> config.param - echo "use_menu=$use_menu" >> config.param - echo "use_mouse=$use_mouse" >> config.param - echo "use_cookie=$use_cookie" >> config.param - echo "use_ssl=$use_ssl" >> config.param - if [ -n "$dmodel" ]; then - echo "dmodel=$dmodel" >> config.param +# +# def_param "name" "default_value" +# => +# $name=${name:-$default_value} +# def_$name='#define $NAME' (if $name=y) +# def_$name='#undef $NAME' (otherwise) +# +def_param() { + flag=$1 + eval "fvar=\$$flag" + dflt=$2 + if [ -z "$fvar" ]; then + eval "fvar=$dflt" + fi + def=`echo $flag | tr 'a-z' 'A-Z'` + if [ "$fvar" = "y" ]; then + eval "def_$flag='#define $def'" + else + eval "def_$flag='#undef $def'" + fi + eval "echo $flag=$fvar >> config.param" +} + +# +# ask_choice "prompt" "var" +# "choice-1" "value-1" "description-1" .. . +# "choice-2" "value-2" "description-2" .. . +# => +# $var=${value-<n>} +# def_$var='#define $VAR ${value-<n>}' +# +ask_choice() { + prompt=$1 + var=$2 + def=`echo $var | tr 'a-z' 'A-Z'` + shift; shift + list="$@" + + echo "$prompt" + varvar= + # check old value + eval "old_dvar=\$$var" + set -- $list + while [ -n "$1" -a -n "$2" ]; do + c=$1; v=$2; shift; shift; + case $v in + $old_dvar) dc=$c; dvar=$old_dvar;; + *) ;; + esac + while [ "$1" != "." ]; do + shift; + done + shift + done + if [ "$all_yes" = 1 ]; then + eval "varvar=$dc" fi + + while [ -z "$varvar" ]; + do + set -- $list + prompt="[" + while [ -n "$1" -a -n "$2" ]; do + c=$1; v=$2; + shift; shift; + Echo "$c .." + while [ "$1" != "." ]; do + Echo " $1"; shift + done + echo " ($def=$v)" + shift + prompt="$prompt$c" + done + prompt="$prompt]? " + Echo "$prompt" + if [ -n "$dvar" ]; then + Echo "(default: $dc - $dvar)" + fi + read REPLY + if [ -z "$REPLY" ]; then + REPLY=$dc + fi + set -- $list + while [ -n "$1" -a -n "$2" ]; do + case $REPLY in + $1) eval "varvar=$2" + break + ;; + esac + shift; shift; + while [ "$1" != "." ]; do + shift; + done + shift + done + done + Echo "You select" + set -- $list + while [ -n "$1" -a -n "$2" ]; do + c=$1; v=$2; shift; shift + case $varvar in + $c) + while [ "$1" != "." ]; do + Echo " $1"; shift + done + shift + eval "def_$var='#define $def $v'" + eval "$var=$v" + eval "echo $var=$v >> config.param"; + echo " $def=$v" + ;; + *) while [ "$1" != "." ]; do + shift; + done + shift + ;; + esac + done +} + +# +# ask_param "prompt" "name" "default_value" +# => +# ask user +# def_param "name" "default_value" +# +ask_param() { + prompt=$1 + flag=$2 + eval "fvar=\$$flag" + dflt=$3 + Echo "$prompt " + if [ "$all_yes" = 0 ]; then + yesno $flag $fvar $dflt + fi + def_param $flag $dflt + if [ "$all_yes" = 1 ]; then + eval "fvar=\$$flag" + if [ "$fvar" = y ]; then + echo ".... yes" + else + echo ".... no" + fi + fi } find_ssl() { @@ -290,7 +425,7 @@ echo "% Please answer some questions." echo "%" extension= -use_binstream='#undef USE_BINMODE_STREAM' +def_use_binstream='#undef USE_BINMODE_STREAM' topdir=$prefix special_sys='' @@ -305,11 +440,11 @@ case "$sysname" in topdir=/cygnus/cygwin-b20/H-i586-cygwin32 fi extension='.exe' - use_binstream='#define USE_BINMODE_STREAM' + def_use_binstream='#define USE_BINMODE_STREAM' ;; OS/2 ) extension='.exe' - use_binstream='#define USE_BINMODE_STREAM' + def_use_binstream='#define USE_BINMODE_STREAM' ;; NetBSD ) # Newer NetBSD system doesn't define 'unix' symbol anymore, but GC library @@ -329,235 +464,131 @@ case "$sysname" in ;; esac -if [ -z "$def_bindir" ]; then - def_bindir="$topdir/bin" +d_bindir=$bindir +if [ -z "$d_bindir" ]; then + d_bindir="$topdir/bin" fi echo "Which directory do you want to put the binary?" -Echo "(default: $def_bindir) " -readdir "$def_bindir" +Echo "(default: $d_bindir) " +readdir "$d_bindir" bindir=$_dir -echo "def_bindir='$bindir'" >> config.param +echo "bindir='$bindir'" >> config.param -if [ -z "$def_libdir" ]; then +d_libdir=$libdir +if [ -z "$d_libdir" ]; then case "$sysname" in *BSD) - def_libdir="$topdir/libexec/w3m" + d_libdir="$topdir/libexec/w3m" ;; *) - def_libdir="$topdir/lib/w3m" + d_libdir="$topdir/lib/w3m" ;; esac fi echo "Which directory do you want to put the support binary files?" -Echo "(default: $def_libdir) " -readdir "$def_libdir" -suplibdir=$_dir -echo "def_libdir='$suplibdir'" >> config.param +Echo "(default: $d_libdir) " +readdir "$d_libdir" +libdir=$_dir +echo "libdir='$libdir'" >> config.param -if [ -z "$def_helpdir" ]; then - def_helpdir="$topdir/lib/w3m" +d_helpdir=$helpdir +if [ -z "$d_helpdir" ]; then + d_helpdir="$topdir/lib/w3m" fi echo "Which directory do you want to put the helpfile?" -Echo "(default: $def_helpdir) " -readdir "$def_helpdir" +Echo "(default: $d_helpdir) " +readdir "$d_helpdir" helpdir=$_dir -echo "def_helpdir='$helpdir'" >> config.param - -echo "Which language do you prefer?" -echo " 1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)" -echo " 2 - English (charset US_ASCII, ISO-8859-1, etc.)" -if [ "$pref_lang" = 2 ]; then - Echo '[2]? ' - def_lg=2 -else - Echo '[1]? ' - def_lg=1 -fi -while : -do - readanswer lg_ans "$def_lg" - if [ "$lg_ans" != 1 -a "$lg_ans" != 2 ]; then - echo "Please choose 1 or 2." - Echo "[$def_lg]? " - continue - else - : - fi - break -done -echo "pref_lang=$lg_ans" >> config.param -if [ "$lg_ans" = 1 ]; then - use_lang="#define LANG JA" - lang=ja -else - use_lang="#define LANG EN" - lang=en -fi - - -if [ "$lang" = ja ]; then - echo "Input your display kanji code." - echo " S - Shift JIS" - echo " E - EUC-JP" - echo ' j - JIS: ESC $@ - ESC (J' - echo ' N - JIS: ESC $B - ESC (J' - echo ' n - JIS: ESC $B - ESC (B' - echo ' m - JIS: ESC $@ - ESC (B' - echo '' - while : - do - if [ -n "$def_dcode" ] ; then - Echo "(default: $def_dcode) " - fi - Echo "Which? " - readanswer ncode "$def_dcode" - case "$ncode" in - [SEjNnm]) - ;; - *) - echo "Illegal code. Try again." - continue - ;; - esac - break - done - echo "def_dcode=$ncode" >> config.param - if [ "$ncode" = "S" ]; then - scode=S - else - scode=E - fi +echo "helpdir='$helpdir'" >> config.param + +ask_choice "Which language do you prefer?" lang \ + 1 JA "Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)" . \ + 2 EN "English (charset US_ASCII, ISO-8859-1, etc)" . + +if [ "$lang" = JA ]; then + ask_choice "What is your display kanji code?" display_code \ + S S "Shift JIS" . \ + E E "EUC-JP" . \ + j j 'JIS: ESC $@ - ESC (J' . \ + N N 'JIS: ESC $B - ESC (J' . \ + n n 'JIS: ESC $B - ESC (B' . \ + m m 'JIS: ESC $@ - ESC (B' . + system_code= + if [ "$display_code" = "S" ]; then + system_code=S + def_param system_code S + else + system_code=E + def_param system_code E + fi else - ncode=x - scode=x + display_code=x + system_code=x + def_param display_code x + def_param system_code x fi -echo "Do you want to use Lynx-like key binding?" -yesno lynx_key "$lynx_key" n -echo "lynx_key=$lynx_key" >> config.param -if [ "$lynx_key" = y ]; then +# editing? +ask_param "Use Lynx-like key binding as default" use_lynx_key n +if [ "$use_lynx_key" = y ]; then keymap_file="keybind_lynx" else keymap_file="keybind" fi +ask_param "Use Emacs-like key binding for filename completion" emacs_like_lineedit n +ask_param "Use vi-like behavior for numeric prefix like '2 SPC'" vi_prec_num n +ask_param "Use mark operations" use_mark n +ask_param "Move cursor to top line when going to label" label_topline n +ask_param "Move cursor to top line when moving to next page" nextpage_topline n -echo "Do you want to use Emacs-like key binding for filename completion?" -yesno emacs_like_lineedit "$emacs_like_lineedit" n -echo "emacs_like_lineedit=$emacs_like_lineedit" >> config.param -if [ "$emacs_like_lineedit" = y ]; then - def_emacs_like_lineedit="#define EMACS_LIKE_LINEEDIT" -else - def_emacs_like_lineedit="#undef EMACS_LIKE_LINEEDIT" -fi - -echo "Do you want to use vi-like behavior for numeric prefix like '2 SPC'?" -yesno vi_prec_num "$vi_prev_num" n -echo "vi_prec_num=$vi_prec_num" >> config.param -if [ "$vi_prec_num" = y ]; then - def_vi_prec_num="#define VI_PREC_NUM" -else - def_vi_prec_num="#undef VI_PREC_NUM" -fi - -echo "Do you want to use mark operations?" -yesno use_mark "$use_mark" n -echo "use_mark=$use_mark" >> config.param -if [ "$use_mark" = y ]; then - def_use_mark='#define USE_MARK' -else - def_use_mark='#undef USE_MARK' -fi - -echo "Do you want to move cursor to top line when going to label?" -yesno label_topline "$label_topline" n -echo "label_topline=$label_topline" >> config.param -if [ "$label_topline" = y ]; then - def_label_topline='#define LABEL_TOPLINE' -else - def_label_topline='#undef LABEL_TOPLINE' -fi - -echo "Do you want to move cursor to top line when moving to next page?" -yesno nextpage_topline "$nextpage_topline" n -echo "nextpage_topline=$nextpage_topline" >> config.param -if [ "$nextpage_topline" = y ]; then - def_nextpage_topline='#define NEXTPAGE_TOPLINE' +# terminal capabilities +if [ "$lang" = "JA" ]; then + ask_param "Use 2-byte character for table border, item, etc." kanji_symbols y else - def_nextpage_topline='#undef NEXTPAGE_TOPLINE' -fi - -if [ "$lang" = ja ]; then - if [ "$lynx_key" = y ]; then + def_param kanji_symbols n +fi +ask_param "ANSI color escape sequences support" use_ansi_color n + +# protocols? +ask_param "Generate domain parts of passwords for anonymous FTP logins" ftppass_hostnamegen n +ask_param "NNTP support" use_nntp n +ask_param "Gopher support" use_gopher n + +# obsoleted? +# ask_param "Use matrix in rendering table" use_matrix n + +### only use config.param +def_param "use_alarm" n +def_param "use_dict" n +def_param "use_history" y +def_param "use_bg_color" y +def_param "format_nice" n +def_param "id_ext" y +def_param "use_bufinfo" y +def_param "use_egd" y +def_param "enable_remove_trailingspaces" n +def_param "menu_thin_frame" n + +def_param "table_expand" n +def_param "table_no_compact" n +def_param nowrap y +def_param matrix y + +if [ "$lang" = "JA" ]; then + if [ "$use_lynx_key" = y ]; then helpfile="w3mhelp-lynx_ja.html" else helpfile="w3mhelp-w3m_ja.html" fi else - if [ "$lynx_key" = y ]; then + if [ "$use_lynx_key" = y ]; then helpfile="w3mhelp-lynx_en.html" else helpfile="w3mhelp-w3m_en.html" fi fi -if [ "$lang" = ja ]; then - echo "Do you want to use 2-byte character for table border, item, etc." - yesno kanji_symbols "$kanji_symbols" y - echo "kanji_symbols=$kanji_symbols" >> config.param -else - kanji_symbols=n -fi -if [ "$kanji_symbols" = y ]; then - def_kanji_symbols="#define KANJI_SYMBOLS" -else - def_kanji_symbols="#undef KANJI_SYMBOLS" -fi - -echo "Do you want ANSI color escape sequences support?" -yesno ansi_color "$ansi_color" n -echo "ansi_color=$ansi_color" >> config.param -if [ "$ansi_color" = y ]; then - def_ansi_color="#define USE_ANSI_COLOR" -else - def_ansi_color="#undef USE_ANSI_COLOR" -fi - - -echo "Do you want to automatically generate domain parts of passwords for anonymous FTP logins" -yesno ftppass_hostnamegen "$ftppass_hostnamegen" n -echo "ftppass_hostnamegen=$ftppass_hostnamegen" >> config.param -if [ "$ftppass_hostnamegen" = y ]; then - def_ftppass_hostnamegen="#define FTPPASS_HOSTNAMEGEN" -else - def_ftppass_hostnamegen="#undef FTPPASS_HOSTNAMEGEN" -fi - -echo "Do you want NNTP support?" -yesno use_nntp "$use_nntp" n -echo "use_nntp=$use_nntp" >> config.param -if [ "$use_nntp" = y ]; then - def_use_nntp="#define USE_NNTP" -else - def_use_nntp="#undef USE_NNTP" -fi - -echo "Do you want Gopher support?" -yesno use_gopher "$use_gopher" n -echo "use_gopher=$use_gopher" >> config.param -if [ "$use_gopher" = y ]; then - def_use_gopher="#define USE_GOPHER" -else - def_use_gopher="#undef USE_GOPHER" -fi - -echo "Do you want use alarm function?" -yesno use_alarm "$use_alarm" n -echo "use_alarm=$use_alarm" >> config.param -if [ "$use_alarm" = y ]; then - def_use_alarm="#define USE_ALARM" -else - def_use_alarm="#undef USE_ALARM" -fi +### echo "" echo "Let's do some configurations. Choose config option among the list." @@ -584,60 +615,50 @@ dmodel_save="$dmodel" dmodel=$ans case "$ans" in 1) - use_color=n; def_color="#undef USE_COLOR" - use_menu=n; def_menu="#undef USE_MENU" - use_mouse=n; def_mouse="#undef USE_MOUSE" - use_cookie=n; def_cookie="#undef USE_COOKIE" - use_ssl=n; def_ssl="#undef USE_SSL" - save_params + use_color=n; + use_menu=n; + use_mouse=n; + use_cookie=n; + use_ssl=n; customized=y ;; 2) - use_color=y; def_color="#define USE_COLOR" - use_menu=y; def_menu="#define USE_MENU" - use_mouse=n; def_mouse="#undef USE_MOUSE" - use_cookie=n; def_cookie="#undef USE_COOKIE" - use_ssl=n; def_ssl="#undef USE_SSL" - save_params + use_color=y; + use_menu=y; + use_mouse=n; + use_cookie=n; + use_ssl=n; customized=y ;; 3) - use_color=y; def_color="#define USE_COLOR" - use_menu=y; def_menu="#define USE_MENU" - use_mouse=y; def_mouse="#define USE_MOUSE" - use_cookie=n; def_cookie="#undef USE_COOKIE" - use_ssl=n; def_ssl="#undef USE_SSL" - save_params + use_color=y; + use_menu=y; + use_mouse=y; + use_cookie=n; + use_ssl=n; customized=y ;; 4) - use_color=y; def_color="#define USE_COLOR" - use_menu=y; def_menu="#define USE_MENU" - use_mouse=y; def_mouse="#define USE_MOUSE" - use_cookie=y; def_cookie="#define USE_COOKIE" - use_ssl=n; def_ssl="#undef USE_SSL" - save_params + use_color=y; + use_menu=y; + use_mouse=y; + use_cookie=y; + use_ssl=n; customized=y ;; 5) - use_color=y; def_color="#define USE_COLOR" - use_menu=y; def_menu="#define USE_MENU" - use_mouse=y; def_mouse="#define USE_MOUSE" - use_cookie=y; def_cookie="#define USE_COOKIE" - use_ssl=y; def_ssl="#define USE_SSL" - find_ssl - save_params + use_color=y; + use_menu=y; + use_mouse=y; + use_cookie=y; + use_ssl=y; customized=y ;; 6) - if [ "X$dmodel_save" = X6 ] - then - if [ "X$use_ssl" = Xy ] - then - find_ssl - fi - save_params - customized=n + if [ "$dmodel_save" = 6 ]; then + customized=y + else + customized=n fi ;; *) @@ -649,96 +670,31 @@ esac break done -if [ "$customized" != y ]; then - -echo "Do you want to use color ESC sequence for kterm/pxvt " -yesno use_color "$use_color" y -echo "use_color=$use_color" >> config.param -if [ "$use_color" = y ]; then - def_color="#define USE_COLOR" -else - def_color="#undef USE_COLOR" +if [ -n "$dmodel" ]; then + echo "dmodel=$dmodel" >> config.param fi -echo 'Do you want to use mouse? (It requires xterm/kterm)' -yesno use_mouse "$use_mouse" n -echo "use_mouse=$use_mouse" >> config.param -if [ "$use_mouse" = y ]; then - def_mouse="#define USE_MOUSE" -else - def_mouse="#undef USE_MOUSE" +save_all_yes=$all_yes +if [ "$customized" = y ]; then + all_yes=1 fi -echo "Do you want to use popup menu?" -yesno use_menu "$use_menu" y -echo "use_menu=$use_menu" >> config.param -if [ "$use_menu" = y ]; then - def_menu="#define USE_MENU" -else - def_menu="#undef USE_MENU" -fi +ask_param "Use color ESC sequence for kterm/pxvt" use_color y +ask_param "Use mouse (requires xterm/kterm/gpm/sysmouse)" use_mouse n +ask_param "Use popup menu" use_menu y +ask_param "Use cookie" use_cookie n +ask_param "Use SSL (need OpenSSL library; Please see http://www.openssl.org/)" use_ssl n -#echo "Do you want to use matrix in rendering table?" -#if [ "$use_matrix" = n ]; then -# Echo '[n]? ' -# read ks_ans -# if [ "$ks_ans" = 'y' ]; then -# use_matrix='y' -# fi -#else -# Echo '[y]? ' -# read ks_ans -# if [ "$ks_ans" = 'n' ]; then -# use_matrix='n' -# else -# use_matrix='y' -# fi -#fi -#use_matrix=y -#echo "use_matrix=$use_matrix" >> config.param -#if [ "$use_matrix" = y ]; then -# def_matrix="#define MATRIX 1" -#else -# def_matrix="#undef MATRIX" -#fi - -echo "Do you want to use cookie?" -yesno use_cookie "$use_cookie" n -echo "use_cookie=$use_cookie" >> config.param -if [ "$use_cookie" = y ]; then - def_cookie="#define USE_COOKIE" -else - def_cookie="#undef USE_COOKIE" -fi +all_yes=$save_all_yes -echo "Do you want to use SSL?" -echo '(You need OpenSSL library; Please see http://www.openssl.org/)' -yesno use_ssl "$use_ssl" n -echo "use_ssl=$use_ssl" >> config.param -if [ "$use_ssl" = y ]; then - def_ssl="#define USE_SSL" - find_ssl -else - def_ssl="#undef USE_SSL" - ssllib="" - sslinclude="" -fi +if [ "$use_ssl" = y ]; then + find_ssl fi - if [ "$use_ssl" = y ]; then - echo "Do you want SSL verification support" - echo '(Your SSL library must be version 0.8 or later)' - yesno use_ssl_verify "$use_ssl_verify" n - echo "use_ssl_verify=$use_ssl_verify" >> config.param - if [ "$use_ssl_verify" = y ]; then - def_use_ssl_verify="#define USE_SSL_VERIFY" - else - def_use_ssl_verify="#undef USE_SSL_VERIFY" - fi + ask_param "SSL verification support (SSL library >= version 0.8)" use_ssl_verify n else - use_ssl_verify=n - def_use_ssl_verify="#undef USE_SSL_VERIFY" + def_param "use_ssl_verify" n fi if [ -z "$ded" ] ; then ded=`./which \vi` ; fi @@ -873,7 +829,7 @@ if [ "$use_mouse" = y ]; then do if [ -f $libdir/libgpm.a -o -f $libdir/libgpm.so ]; then echo "GPM library found." - use_gpm="#define USE_GPM" + def_use_gpm="#define USE_GPM" gpmlib="-lgpm" fi done @@ -881,10 +837,10 @@ fi case $sysname in freebsd|FreeBSD) - use_sysmouse="#define USE_SYSMOUSE" + def_use_sysmouse="#define USE_SYSMOUSE" ;; *) - use_sysmouse="#undef USE_SYSMOUSE" + def_use_sysmouse="#undef USE_SYSMOUSE" ;; esac @@ -1071,7 +1027,7 @@ echo "Checking machine dependency." ###### mime.types MIME_TYPES="" -if [ -n "$mimetypes" ] && [ -f "$mimetypes" ]; then +if [ -n "$mimetypes" ]; then MIME_TYPES=$mimetypes else for d in /etc /usr/lib /usr/local/lib /usr/local/etc $prefix/lib /usr/local/etc/apache /usr/local/lib/mosaic /usr/local/mosaic /usr/local/netscape /usr/local/lib/netscape @@ -1132,10 +1088,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have strcasecmp()." - strcasecmp_flg="#define HAVE_STRCASECMP" + def_have_strcasecmp="#define HAVE_STRCASECMP" else echo "You don't have strcasecmp()." - strcasecmp_flg="#undef HAVE_STRCASECMP" + def_have_strcasecmp="#undef HAVE_STRCASECMP" fi ####### strchr @@ -1150,10 +1106,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have strchr()." - strchr_flg="#define HAVE_STRCHR" + def_have_strchr="#define HAVE_STRCHR" else echo "You don't have strchr()." - strchr_flg="#undef HAVE_STRCHR" + def_have_strchr="#undef HAVE_STRCHR" fi ####### strerror @@ -1167,10 +1123,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have strerror()." - strerror_flg="#define HAVE_STRERROR" + def_have_strerror="#define HAVE_STRERROR" else echo "You don't have strerror()." - strerror_flg="#undef HAVE_STRERROR" + def_have_strerror="#undef HAVE_STRERROR" fi @@ -1184,10 +1140,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have sys_errlist[]." - syserrlist_flg="#define HAVE_SYS_ERRLIST" + def_have_syserrlist="#define HAVE_SYS_ERRLIST" else echo "You don't have sys_errlist[]." - syserrlist_flg="#undef HAVE_SYS_ERRLIST" + def_have_syserrlist="#undef HAVE_SYS_ERRLIST" fi ####### bcopy @@ -1202,10 +1158,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have bcopy()." - bcopy_flg="#define HAVE_BCOPY" + def_have_bcopy="#define HAVE_BCOPY" else echo "You don't have bcopy()." - bcopy_flg="#undef HAVE_BCOPY" + def_have_bcopy="#undef HAVE_BCOPY" fi ####### waitpid @@ -1227,10 +1183,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have waitpid()." - waitpid_flg="#define HAVE_WAITPID" + def_have_waitpid="#define HAVE_WAITPID" else echo "You don't have waitpid()." - waitpid_flg="#undef HAVE_WAITPID" + def_have_waitpid="#undef HAVE_WAITPID" fi ####### wait3 @@ -1258,10 +1214,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have wait3()." - wait3_flg="#define HAVE_WAIT3" + def_have_wait3="#define HAVE_WAIT3" else echo "You don't have wait3()." - wait3_flg="#undef HAVE_WAIT3" + def_have_wait3="#undef HAVE_WAIT3" fi ####### strftime @@ -1280,10 +1236,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have strftime()." - strftime_flg="#define HAVE_STRFTIME" + def_have_strftime="#define HAVE_STRFTIME" else echo "You don't have strftime()." - strftime_flg="#undef HAVE_STRFTIME" + def_have_strftime="#undef HAVE_STRFTIME" fi @@ -1300,10 +1256,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have getcwd()." - getcwd_flg="#define HAVE_GETCWD" + def_have_getcwd="#define HAVE_GETCWD" else echo "You don't have getcwd()." - getcwd_flg="#undef HAVE_GETCWD" + def_have_getcwd="#undef HAVE_GETCWD" fi ####### getwd @@ -1317,10 +1273,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have getwd()." - getwd_flg="#define HAVE_GETWD" + def_have_getwd="#define HAVE_GETWD" else echo "You don't have getwd()." - getwd_flg="#undef HAVE_GETWD" + def_have_getwd="#undef HAVE_GETWD" fi ####### readlink @@ -1334,10 +1290,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have readlink()." - readlink_flg="#define HAVE_READLINK" + def_have_readlink="#define HAVE_READLINK" else echo "You don't have readlink()." - readlink_flg="#undef HAVE_READLINK" + def_have_readlink="#undef HAVE_READLINK" fi ####### setenv @@ -1351,10 +1307,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have setenv()." - setenv_flg="#define HAVE_SETENV" + def_have_setenv="#define HAVE_SETENV" else echo "You don't have setenv()." - setenv_flg="#undef HAVE_SETENV" + def_have_setenv="#undef HAVE_SETENV" fi ####### putenv @@ -1368,10 +1324,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have putenv()." - putenv_flg="#define HAVE_PUTENV" + def_have_putenv="#define HAVE_PUTENV" else echo "You don't have putenv()." - putenv_flg="#undef HAVE_PUTENV" + def_have_putenv="#undef HAVE_PUTENV" fi ####### sigsetjmp @@ -1389,14 +1345,14 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have sigsetjmp()." - setjmp_def="#define SETJMP(env) sigsetjmp(env,1)" - longjmp_def="#define LONGJMP(env,val) siglongjmp(env,val)" - jmpbuf_def="#define JMP_BUF sigjmp_buf" + def_setjmp="#define SETJMP(env) sigsetjmp(env,1)" + def_longjmp="#define LONGJMP(env,val) siglongjmp(env,val)" + def_jmpbuf="#define JMP_BUF sigjmp_buf" else echo "You don't have sigsetjmp()." - setjmp_def="#define SETJMP(env) setjmp(env)" - longjmp_def="#define LONGJMP(env,val) longjmp(env)" - jmpbuf_def="#define JMP_BUF jmp_buf" + def_setjmp="#define SETJMP(env) setjmp(env)" + def_longjmp="#define LONGJMP(env,val) longjmp(env)" + def_jmpbuf="#define JMP_BUF jmp_buf" fi ####### srand48 @@ -1410,10 +1366,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have srand48()." - srand48_flg="#define HAVE_SRAND48" + def_have_srand48="#define HAVE_SRAND48" else echo "You don't have srand48()." - srand48_flg="#undef HAVE_SRAND48" + def_have_srand48="#undef HAVE_SRAND48" fi ####### srandom @@ -1427,10 +1383,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have srandom()." - srandom_flg="#define HAVE_SRANDOM" + def_have_srandom="#define HAVE_SRANDOM" else echo "You don't have srandom()." - srandom_flg="#undef HAVE_SRANDOM" + def_have_srandom="#undef HAVE_SRANDOM" fi ####### getpassphrase @@ -1444,10 +1400,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have getpassphrase()." - getpassphrase_flg="#define HAVE_GETPASSPHRASE" + def_have_getpassphrase="#define HAVE_GETPASSPHRASE" else echo "You don't have getpassphrase()." - getpassphrase_flg="#undef HAVE_GETPASSPHRASE" + def_have_getpassphrase="#undef HAVE_GETPASSPHRASE" fi ####### chdir @@ -1462,10 +1418,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "You have chdir()." - chdir_flg="#define HAVE_CHDIR" + def_have_chdir="#define HAVE_CHDIR" else echo "You don't have chdir()." - chdir_flg="#undef HAVE_CHDIR" + def_have_chdir="#undef HAVE_CHDIR" fi ####### fclose @@ -1480,10 +1436,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "fclose() is declared." - fclose_dcl='' + dcl_fclose='' else echo "fclose() is not declared." - fclose_dcl='void fclose(FILE*);' + dcl_fclose='void fclose(FILE*);' fi ####### pclose @@ -1498,50 +1454,50 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 then echo "pclose() is declared." - pclose_dcl='' + dcl_pclose='' else echo "pclose() is not declared." - pclose_dcl='void pclose(FILE*);' + dcl_pclose='void pclose(FILE*);' fi ####### termios/termio/sgtty -term_if='#define SGTTY' +def_term_if='#define HAVE_SGTTY_H' if [ $sysname = "HP-UX" ]; then echo "Your OS is HP-UX; using termio" - term_if="#define HAVE_TERMIO_H" + def_term_if="#define HAVE_TERMIO_H" elif [ $sysname = "CYGWIN" ]; then echo "Your OS is CYGWIN; using termios" - term_if="#define HAVE_TERMIOS_H" + def_term_if="#define HAVE_TERMIOS_H" elif [ $sysname = "OS/2" ]; then echo "Your OS is OS/2; using termios" - term_if='#define HAVE_TERMIOS_H' + def_term_if='#define HAVE_TERMIOS_H' elif [ -r /usr/include/termios.h ]; then echo "You have termios." - term_if='#define HAVE_TERMIOS_H' + def_term_if='#define HAVE_TERMIOS_H' elif [ -r /usr/include/termio.h ]; then echo "You have termio." - term_if='#define HAVE_TERMIO_H' + def_term_if='#define HAVE_TERMIO_H' elif [ -r /usr/include/sgtty.h ]; then echo "You have sgtty." - term_if='#define HAVE_SGTTY_H' + def_term_if='#define HAVE_SGTTY_H' else echo "Do you have tty interface? I can't find one but I hope sgtty works..." fi ####### dirent/direct -dir_if='' +def_dir_if='' if [ $sysname = "CYGWIN" ]; then echo "Your OS is CYGWIN; using dirent.h" - dir_if='#define HAVE_DIRENT_H' + def_dir_if='#define HAVE_DIRENT_H' elif [ $sysname = "OS/2" ]; then echo "Your OS is OS/2; using dirent.h" - dir_if='#define HAVE_DIRENT_H' + def_dir_if='#define HAVE_DIRENT_H' elif [ -r /usr/include/dirent.h ]; then echo "You have dirent.h." - dir_if='#define HAVE_DIRENT_H' + def_dir_if='#define HAVE_DIRENT_H' elif [ -r /usr/include/sys/dir.h ]; then echo "You have sys/dir.h." - dir_if='' + def_dir_if='' else echo "Do you have directory interface? I can't find one but I hope sys/dir.h works..." fi @@ -1552,28 +1508,28 @@ do_sigtest int int if [ $stat = 0 -a -z "$warning" ] then echo 'signal handler is int handler(int).' - sig_type='typedef int MySignalHandler;' - sig_arg='#define SIGNAL_ARG int _dummy' - sig_arglist='#define SIGNAL_ARGLIST 0' - sig_return='#define SIGNAL_RETURN return 0' + def_sighandler='typedef int MySignalHandler;' + def_sig_arg='#define SIGNAL_ARG int _dummy' + def_sig_arglist='#define SIGNAL_ARGLIST 0' + def_sig_return='#define SIGNAL_RETURN return 0' else do_sigtest int void if [ $stat = 0 -a -z "$warning" ] then echo 'signal handler is int handler(void).' - sig_type='typedef int MySignalHandler;' - sig_arg='#define SIGNAL_ARG void' - sig_arglist='#define SIGNAL_ARGLIST' - sig_return='#define SIGNAL_RETURN return 0' + def_sighandler='typedef int MySignalHandler;' + def_sig_arg='#define SIGNAL_ARG void' + def_sig_arglist='#define SIGNAL_ARGLIST' + def_sig_return='#define SIGNAL_RETURN return 0' else do_sigtest void int if [ $stat = 0 -a -z "$warning" ] then echo 'signal handler is void handler(int).' - sig_type='typedef void MySignalHandler;' - sig_arg='#define SIGNAL_ARG int _dummy' - sig_arglist='#define SIGNAL_ARGLIST 0' - sig_return='#define SIGNAL_RETURN return' + def_sighandler='typedef void MySignalHandler;' + def_sig_arg='#define SIGNAL_ARG int _dummy' + def_sig_arglist='#define SIGNAL_ARGLIST 0' + def_sig_return='#define SIGNAL_RETURN return' else do_sigtest void void if [ $stat = 0 -a -z "$warning" ] @@ -1582,10 +1538,10 @@ else else echo 'I could not find the type of signal handler. I hope void handler(void) works.' fi - sig_type='typedef void MySignalHandler;' - sig_arg='#define SIGNAL_ARG void' - sig_arglist='#define SIGNAL_ARGLIST' - sig_return='#define SIGNAL_RETURN return' + def_sighandler='typedef void MySignalHandler;' + def_sig_arg='#define SIGNAL_ARG void' + def_sig_arglist='#define SIGNAL_ARGLIST' + def_sig_return='#define SIGNAL_RETURN return' fi fi fi @@ -1622,9 +1578,9 @@ EOF if $cc $cflags -c _zmachdep.c > /dev/null 2>&1 then echo "You have float.h." - float_h='#define HAVE_FLOAT_H' + def_have_float_h='#define HAVE_FLOAT_H' else - float_h='#undef HAVE_FLOAT_H' + def_have_float_h='#undef HAVE_FLOAT_H' fi ####### check for sys/select.h @@ -1638,9 +1594,9 @@ EOF if $cc $cflags -c _zmachdep.c > /dev/null 2>&1 then echo "You have sys/select.h." - sys_select_h='#define HAVE_SYS_SELECT_H' + def_have_sys_select_h='#define HAVE_SYS_SELECT_H' else - sys_select_h='#undef HAVE_SYS_SELECT_H' + def_have_sys_select_h='#undef HAVE_SYS_SELECT_H' fi ####### setpgrp(pid, pgrp) or setpgrp() ? @@ -1668,10 +1624,10 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1 then echo "You have setpgrp( pid, pgrp )." - have_setpgrp='#define HAVE_SETPGRP' + def_have_setpgrp='#define HAVE_SETPGRP' setpgrp='#define setpgrp() setpgrp( 0, 0 )' else - have_setpgrp='' + def_have_setpgrp='' fi fi @@ -1715,14 +1671,14 @@ main() exit(0); } EOF -ipv6="#undef INET6" +def_ipv6="#undef INET6" v6_ss_family="" v6lib='' if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1 then if ./_zmachdep; then - ipv6="#define INET6" + def_ipv6="#define INET6" fi case $sysname in *BSD|*bsd) @@ -1757,18 +1713,18 @@ EOF done if [ "X$v6lib" = "X" ]; then echo "You don't have getaddrinfo()." - ipv6="#undef INET6" + def_ipv6="#undef INET6" fi fi ;; CYGWIN*) - ipv6="#undef INET6" + def_ipv6="#undef INET6" ;; esac fi ####### ss_family or __ss_family ? -if [ "$ipv6" = "#define INET6" ]; then +if [ "$def_ipv6" = "#define INET6" ]; then cat > _zmachdep.c <<EOF #include <sys/types.h> #include <sys/socket.h> @@ -1792,22 +1748,20 @@ EOF if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1 then echo "You have __ss_family." - ipv6_ss_family="#define ss_family __ss_family" + def_ipv6_ss_family="#define ss_family __ss_family" else echo "You don't have ss_family." - ipv6="#undef INET6" + def_ipv6="#undef INET6" fi fi fi -if [ "$ipv6" = "#undef INET6" ]; then +if [ "$def_ipv6" = "#undef INET6" ]; then echo "You don't have IPv6 support." else echo "You have IPv6 support." fi - - rm -f _zmachdep$extension _zmachdep.c _zmachdep.o echo "------------ Configuration done ------------" @@ -1854,54 +1808,61 @@ cat > config.h << END_OF_CONFIG_H If you define DICT, you can use dictionary look-up function in w3m. See README.dict for detail. */ -#undef DICT +$def_use_dict /* If you want to load and save URL history. */ -#define USE_HISTORY +$def_use_history /* USE_BG_COLOR enables w3m to set background color. */ -#define USE_BG_COLOR +$def_use_bg_color /* * Do word fill */ -#undef FORMAT_NICE +$def_format_nice /* * Enable id attribute */ -#define ID_EXT +$def_id_ext /* * Save Current-buffer Information */ -#define BUFINFO +$def_use_bufinfo /* * Support EGD (Entropy Gathering Daemon) */ -#undef USE_EGD +$def_egd /* * Remove line trailing spaces in html buffer. */ -#undef ENABLE_REMOVE_TRAILINGSPACES +$def_enable_remove_trailingspaces /* * thin chars for menu frame */ -#undef MENU_THIN_FRAME +$def_menu_thin_frame + +/* + */ +$def_table_expand +$def_table_no_compact +$def_nowrap +$def_matrix /**********************************************************/ #ifdef makefile_parameter BIN_DIR = $bindir HELP_DIR = $helpdir -LIB_DIR = $suplibdir +LIB_DIR = $libdir HELP_FILE = $helpfile SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib LOCAL_LIBRARIES = $bsdlib $ldflags @@ -1926,26 +1887,26 @@ MODEL=$sysname.$platform-$modelname-$lang #else $special_sys -#define DISPLAY_CODE '$ncode' -#define SYSTEM_CODE '$scode' +#define DISPLAY_CODE '$display_code' +#define SYSTEM_CODE '$system_code' #define JA 0 #define EN 1 -$use_lang +$def_lang $def_kanji_symbols -$def_color -$def_ansi_color +$def_use_color +$def_use_ansi_color $def_emacs_like_lineedit $def_vi_prec_num $def_use_mark $def_label_topline $def_nextpage_topline -$def_mouse -$use_gpm -$use_sysmouse -$def_menu -$def_cookie -$def_ssl +$def_use_mouse +$def_use_gpm +$def_use_sysmouse +$def_use_menu +$def_use_cookie +$def_use_ssl $def_use_ssl_verify $def_ftppass_hostnamegen $def_use_nntp @@ -1956,7 +1917,7 @@ $def_use_alarm #define DEF_MAILER "$mailer" #define DEF_EXT_BROWSER "$brz" -#define LIB_DIR "$suplibdir" +#define LIB_DIR "$libdir" #define HELP_DIR "$helpdir" #define HELP_FILE "w3mhelp.html" #define W3MCONFIG "w3mconfig" @@ -1976,52 +1937,47 @@ $def_use_alarm #define DEF_SAVE_FILE "index.html" -$use_binstream -$term_if -$dir_if -$strcasecmp_flg -$strchr_flg -$strerror_flg -$syserrlist_flg -$bcopy_flg -$waitpid_flg -$wait3_flg -$strftime_flg -$getdtablesize_flg -$getcwd_flg -$getwd_flg -$readlink_flg -$setenv_flg -$putenv_flg -$srand48_flg -$srandom_flg -$getpassphrase_flg -$chdir_flg -$fclose_dcl -$pclose_dcl -$setjmp_def -$longjmp_def -$jmpbuf_def - -$sig_type -$sig_arg -$sig_arglist -$sig_return -$have_setpgrp -$setpgrp +$def_use_binstream +$def_term_if +$def_dir_if +$def_have_strcasecmp +$def_have_strchr +$def_have_strerror +$def_have_syserrlist +$def_have_bcopy +$def_have_waitpid +$def_have_wait3 +$def_have_strftime +$def_have_getcwd +$def_have_getwd +$def_have_readlink +$def_have_setenv +$def_have_putenv +$def_have_srand48 +$def_have_srandom +$def_have_getpassphrase +$def_have_chdir +$dcl_fclose +$dcl_pclose +$def_setjmp +$def_longjmp +$def_jmpbuf +$def_have_float_h +$def_have_sys_select_h + +$def_sighandler +$def_sig_arg +$def_sig_arglist +$def_sig_return +$def_have_setpgrp +$def_setpgrp /* If you want to use IPv6, define this symbol. */ -$ipv6 -$ipv6_ss_family - -#undef TABLE_EXPAND -#undef TABLE_NO_COMPACT -#define NOWRAP 1 -#define MATRIX 1 -$float_h -$sys_select_h +$def_ipv6 +$def_ipv6_ss_family +/** dont edit below **/ #ifndef HAVE_SRAND48 #ifdef HAVE_SRANDOM #define srand48 srandom diff --git a/display.c b/display.c @@ -182,7 +182,7 @@ static int graph_mode = 0; static Linecolor color_mode = 0; #endif -#ifdef BUFINFO +#ifdef USE_BUFINFO static Buffer *save_current_buf = NULL; #endif @@ -313,7 +313,7 @@ displayBuffer(Buffer * buf, int mode) message(msg->ptr, buf->cursorX + buf->rootX, buf->cursorY); standend(); refresh(); -#ifdef BUFINFO +#ifdef USE_BUFINFO if (Currentbuf != save_current_buf) { saveBufferInfo(); save_current_buf = Currentbuf; diff --git a/doc-jp/README.dict b/doc-jp/README.dict @@ -12,11 +12,11 @@ w3m コンパイルしなおす必要があります.configure を実行して config.h が生成された後,config.h を編集して -#undef DICT +#undef USE_DICT -#define DICT +#define USE_DICT に変更し,w3m をコンパイルしなおしてください. (dict.c と keybind.c をコンパイルしなおせば良いはずです) diff --git a/doc/README.dict b/doc/README.dict @@ -12,11 +12,11 @@ To make use of dictionary look-up, you have to change compile option by hand. After running configure, edit config.h and change -#undef DICT +#undef USE_DICT into -#define DICT +#define USE_DICT and recompile w3m. (You have to recompile dict.c and keybind.c.) diff --git a/fm.h b/fm.h @@ -90,10 +90,10 @@ void bzero(void *, int); #define SHELLBUFFERNAME "*Shellout*" #define PIPEBUFFERNAME "*stream*" #define CPIPEBUFFERNAME "*stream(closed)*" -#ifdef DICT +#ifdef USE_DICT #define DICTCMD "w3mdict" #define DICTBUFFERNAME "*dictionary*" -#endif /* DICT */ +#endif /* USE_DICT */ /* * Line Property diff --git a/main.c b/main.c @@ -759,7 +759,7 @@ MAIN(int argc, char **argv, char **envp) if (Currentbuf->frameset != NULL && RenderFrame) rFrame(); Currentbuf = newbuf; -#ifdef BUFINFO +#ifdef USE_BUFINFO saveBufferInfo(); #endif } @@ -1037,7 +1037,7 @@ pushBuffer(Buffer * buf) buf->nextBuffer = Currentbuf; Currentbuf = buf; } -#ifdef BUFINFO +#ifdef USE_BUFINFO saveBufferInfo(); #endif @@ -4419,7 +4419,7 @@ GetWord(Buffer * buf) return Strnew_charp_n(&lb[b], e - b)->ptr; } -#ifdef DICT +#ifdef USE_DICT static void execdict(char *word) { @@ -4473,7 +4473,7 @@ dictwordat(void) { execdict(GetWord(Currentbuf)); } -#endif /* DICT */ +#endif /* USE_DICT */ void set_buffer_environ(Buffer *buf) diff --git a/proto.h b/proto.h @@ -526,13 +526,13 @@ extern void initMenu(void); #define selMn selBuf #endif /* not USE_MENU */ -#ifdef DICT +#ifdef USE_DICT extern void dictword(void); extern void dictwordat(void); -#else /* not DICT */ +#else /* not USE_DICT */ #define dictword nulcmd #define dictwordat nulcmd -#endif /* not DICT */ +#endif /* not USE_DICT */ extern void reloadBuffer(Buffer * buf);