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

reduce NO_RCFILE to a static bool in nano.c, since it's only used there 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3421 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2006-04-24 18:54:29 +00:00
parent 891e0ec281
commit 18dae628d2
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -49,6 +49,8 @@ CVS code -
read. Changes to sc_init_one(), toggle_init(), read. Changes to sc_init_one(), toggle_init(),
toggle_init_one(), shortcut_init(), get_toggle(), and toggle_init_one(), shortcut_init(), get_toggle(), and
help_init(). (DLR, suggested by Benno Schulenberg) help_init(). (DLR, suggested by Benno Schulenberg)
- Reduce NO_RCFILE to a static bool in nano.c, since it's only
used there. Changes to finish() and main(). (DLR)
- files.c: - files.c:
open_file() open_file()
- Remove redundant wording in the error message when we try to - Remove redundant wording in the error message when we try to

14
src/nano.c
View File

@ -44,6 +44,10 @@
#include <setjmp.h> #include <setjmp.h>
#endif #endif
#ifdef ENABLE_NANORC
static bool no_rcfiles = FALSE;
/* Should we ignore all rcfiles? */
#endif
static struct termios oldterm; static struct termios oldterm;
/* The user's original terminal settings. */ /* The user's original terminal settings. */
static struct sigaction act; static struct sigaction act;
@ -543,7 +547,7 @@ void finish(void)
tcsetattr(0, TCSANOW, &oldterm); tcsetattr(0, TCSANOW, &oldterm);
#if !defined(NANO_TINY) && defined(ENABLE_NANORC) #if !defined(NANO_TINY) && defined(ENABLE_NANORC)
if (!ISSET(NO_RCFILE) && ISSET(HISTORYLOG)) if (!no_rcfiles && ISSET(HISTORYLOG))
save_history(); save_history();
#endif #endif
@ -1726,7 +1730,7 @@ int main(int argc, char **argv)
break; break;
#endif #endif
case 'I': case 'I':
SET(NO_RCFILE); no_rcfiles = TRUE;
break; break;
#endif #endif
case 'K': case 'K':
@ -1859,14 +1863,14 @@ int main(int argc, char **argv)
if (ISSET(RESTRICTED)) { if (ISSET(RESTRICTED)) {
UNSET(SUSPEND); UNSET(SUSPEND);
UNSET(BACKUP_FILE); UNSET(BACKUP_FILE);
SET(NO_RCFILE); no_rcfiles = TRUE;
} }
/* We've read through the command line options. Now back up the flags /* We've read through the command line options. Now back up the flags
* and values that are set, and read the rcfile(s). If the values * and values that are set, and read the rcfile(s). If the values
* haven't changed afterward, restore the backed-up values. */ * haven't changed afterward, restore the backed-up values. */
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
if (!ISSET(NO_RCFILE)) { if (!no_rcfiles) {
#ifndef DISABLE_OPERATINGDIR #ifndef DISABLE_OPERATINGDIR
char *operating_dir_cpy = operating_dir; char *operating_dir_cpy = operating_dir;
#endif #endif
@ -1947,7 +1951,7 @@ int main(int argc, char **argv)
/* Set up the search/replace history. */ /* Set up the search/replace history. */
history_init(); history_init();
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
if (!ISSET(NO_RCFILE) && ISSET(HISTORYLOG)) if (!no_rcfiles && ISSET(HISTORYLOG))
load_history(); load_history();
#endif #endif
#endif #endif

25
src/nano.h
View File

@ -364,19 +364,18 @@ typedef struct rcoption {
#define REBIND_KEYPAD (1<<16) #define REBIND_KEYPAD (1<<16)
#define NO_CONVERT (1<<17) #define NO_CONVERT (1<<17)
#define BACKUP_FILE (1<<18) #define BACKUP_FILE (1<<18)
#define NO_RCFILE (1<<19) #define NO_COLOR_SYNTAX (1<<19)
#define NO_COLOR_SYNTAX (1<<20) #define PRESERVE (1<<20)
#define PRESERVE (1<<21) #define HISTORYLOG (1<<21)
#define HISTORYLOG (1<<22) #define RESTRICTED (1<<22)
#define RESTRICTED (1<<23) #define SMART_HOME (1<<23)
#define SMART_HOME (1<<24) #define WHITESPACE_DISPLAY (1<<24)
#define WHITESPACE_DISPLAY (1<<25) #define MORE_SPACE (1<<25)
#define MORE_SPACE (1<<26) #define TABS_TO_SPACES (1<<26)
#define TABS_TO_SPACES (1<<27) #define QUICK_BLANK (1<<27)
#define QUICK_BLANK (1<<28) #define WORD_BOUNDS (1<<28)
#define WORD_BOUNDS (1<<29) #define NO_NEWLINES (1<<29)
#define NO_NEWLINES (1<<30) #define BOLD_TEXT (1<<30)
#define BOLD_TEXT (1<<31)
/* Control key sequences. Changing these would be very, very bad. */ /* Control key sequences. Changing these would be very, very bad. */
#define NANO_CONTROL_SPACE 0 #define NANO_CONTROL_SPACE 0