tweaks: remove some more annoying conditional compilation
parent
454f5cbdce
commit
4eac699df3
|
@ -422,12 +422,8 @@ void stat_with_alloc(const char *filename, struct stat **pstat)
|
|||
* or into a new buffer when MULTIBUFFER is set or there is no buffer yet. */
|
||||
bool open_buffer(const char *filename, bool undoable)
|
||||
{
|
||||
bool new_buffer = (openfile == NULL
|
||||
#ifndef DISABLE_MULTIBUFFER
|
||||
|| ISSET(MULTIBUFFER)
|
||||
#endif
|
||||
);
|
||||
/* Whether we load into this buffer or a new one. */
|
||||
bool new_buffer = (openfile == NULL || ISSET(MULTIBUFFER));
|
||||
/* Whether we load into the current buffer or a new one. */
|
||||
char *realname;
|
||||
/* The filename after tilde expansion. */
|
||||
FILE *f;
|
||||
|
|
|
@ -1415,14 +1415,7 @@ void do_toggle(int flag)
|
|||
|
||||
enabled = ISSET(flag);
|
||||
|
||||
if (flag == NO_HELP
|
||||
#ifndef DISABLE_WRAPPING
|
||||
|| flag == NO_WRAP
|
||||
#endif
|
||||
#ifndef DISABLE_COLOR
|
||||
|| flag == NO_COLOR_SYNTAX
|
||||
#endif
|
||||
)
|
||||
if (flag == NO_HELP || flag == NO_WRAP || flag == NO_COLOR_SYNTAX)
|
||||
enabled = !enabled;
|
||||
|
||||
statusline(HUSH, "%s %s", _(flagtostr(flag)),
|
||||
|
|
Loading…
Reference in New Issue