ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: remove some more annoying conditional compilation

master
Benno Schulenberg 2016-12-03 20:25:16 +01:00
parent 454f5cbdce
commit 4eac699df3
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/files.c
View File

@ -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. */ * or into a new buffer when MULTIBUFFER is set or there is no buffer yet. */
bool open_buffer(const char *filename, bool undoable) bool open_buffer(const char *filename, bool undoable)
{ {
bool new_buffer = (openfile == NULL bool new_buffer = (openfile == NULL || ISSET(MULTIBUFFER));
#ifndef DISABLE_MULTIBUFFER /* Whether we load into the current buffer or a new one. */
|| ISSET(MULTIBUFFER)
#endif
);
/* Whether we load into this buffer or a new one. */
char *realname; char *realname;
/* The filename after tilde expansion. */ /* The filename after tilde expansion. */
FILE *f; FILE *f;

9
src/nano.c
View File

@ -1415,14 +1415,7 @@ void do_toggle(int flag)
enabled = ISSET(flag); enabled = ISSET(flag);
if (flag == NO_HELP if (flag == NO_HELP || flag == NO_WRAP || flag == NO_COLOR_SYNTAX)
#ifndef DISABLE_WRAPPING
|| flag == NO_WRAP
#endif
#ifndef DISABLE_COLOR
|| flag == NO_COLOR_SYNTAX
#endif
)
enabled = !enabled; enabled = !enabled;
statusline(HUSH, "%s %s", _(flagtostr(flag)), statusline(HUSH, "%s %s", _(flagtostr(flag)),