diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | fm.h | 4 | ||||
| -rw-r--r-- | rc.c | 9 |
3 files changed, 18 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp> + * [w3m-dev-en 00788] + * fm.h (displayImage): FALSE ifndef USE_IMAGE + * rc.c (displayImage): display_image even if USE_IMAGE undefined + (sync_with_options): display_image is forced to be FALSE + ifndef USE_IMAGE + +2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp> + * [w3m-dev-en 00783] hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO) add display_lineinfo option * display.c (displayBuffer): check displayLineInfo @@ -3979,4 +3987,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.449 2002/10/26 08:10:43 ukai Exp $ +$Id: ChangeLog,v 1.450 2002/10/26 11:19:47 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.65 2002/10/26 08:10:43 ukai Exp $ */ +/* $Id: fm.h,v 1.66 2002/10/26 11:19:47 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -828,6 +828,8 @@ global int displayImage init(TRUE); global int autoImage init(TRUE); global int useExtImageViewer init(TRUE); global int maxLoadImage init(4); +#else +global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */ #endif global char *Editor init(DEF_EDITOR); #ifdef USE_W3MMAILER @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.51 2002/10/26 08:10:43 ukai Exp $ */ +/* $Id: rc.c,v 1.52 2002/10/26 11:19:47 ukai Exp $ */ /* * Initialization file etc. */ @@ -467,7 +467,7 @@ struct param_ptr params1[] = { {"target_self", P_CHARINT, PI_ONOFF, (void *)&TargetSelf, CMT_TSELF, NULL}, {"display_link", P_INT, PI_ONOFF, (void *)&displayLink, CMT_DISPLINK, NULL}, - {"display_lineinfo", P_INT, PI_ONOFF, (void *)&displayLineInfo, + {"display_lineinfo", P_INT, PI_ONOFF, (void *)&displayLineInfo, CMT_DISPLINEINFO, NULL}, {"ext_dirlist", P_INT, PI_ONOFF, (void *)&UseExternalDirBuffer, CMT_EXT_DIRLIST, NULL}, @@ -488,9 +488,10 @@ struct param_ptr params1[] = { CMT_IGNORE_NULL_IMG_ALT, NULL}, {"view_unseenobject", P_INT, PI_ONOFF, (void *)&view_unseenobject, CMT_VIEW_UNSEENOBJECTS, NULL}, -#ifdef USE_IMAGE + /* XXX: emacs-w3m force to off display_image even if image options off */ {"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE, NULL}, +#ifdef USE_IMAGE {"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL}, {"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage, CMT_MAX_LOAD_IMAGE, NULL}, @@ -1237,6 +1238,8 @@ sync_with_option(void) #ifdef USE_IMAGE if (fmInitialized && displayImage) initImage(); +#else + displayImage = FALSE; /* XXX */ #endif loadPasswd(); |