From: Benno Schulenberg Date: Mon, 7 Apr 2014 20:05:05 +0000 (+0000) Subject: Ehm, no, cancel that. That makes it act like X-Git-Tag: v2.3.3~187 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6f6ee844c7ee4b9e4f7010078ee2fd85f7920b32;p=nano.git Ehm, no, cancel that. That makes it act like a command-line option, overriding any nanorc. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4743 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 9001f04c..4cfd46ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,9 +8,6 @@ * src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete argument of shortcut_init(), and remove two unneeded calls of it. * src/global.c (shortcut_init): Allow M-J after an --enable-justify. - * src/nano.c (main): No matter whether nanorc support was disabled - or not, or the rcfile should be ignored or not, when we're root and - --disable-wrapping-as-root was used, switch wrapping off. 2014-04-06 Benno Schulenberg * src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to diff --git a/src/nano.c b/src/nano.c index 080abedc..de3b5c81 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2184,9 +2184,9 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif -#ifdef DISABLE_ROOTWRAPPING - /* If --disable-wrapping-as-root was used, - * and we're root, turn wrapping off. */ +#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAPPING) + /* If we don't have rcfile support, --disable-wrapping-as-root is + * used, and we're root, turn wrapping off. */ if (geteuid() == NANO_ROOT_UID) SET(NO_WRAP); #endif @@ -2487,6 +2487,12 @@ int main(int argc, char **argv) for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) flags[i] |= flags_cpy[i]; } +#ifdef DISABLE_ROOTWRAPPING + /* If we don't have any rcfiles, --disable-wrapping-as-root is used, + * and we're root, turn wrapping off. */ + else if (geteuid() == NANO_ROOT_UID) + SET(NO_WRAP); +#endif #endif /* ENABLE_NANORC */ #ifndef DISABLE_WRAPPING