mirror of
git://git.sv.gnu.org/nano.git
synced 2024-11-22 12:51:23 +03:00
rename the DISABLE_ROOTWRAP #define to DISABLE_ROOTWRAPPING
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3798 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
parent
23994bd8a0
commit
e53e12559f
@ -41,6 +41,8 @@ CVS code -
|
||||
curses.h, which breaks compilation there. Changes to
|
||||
do_page_up(), do_page_down(), do_up(), do_down(), nano.h, and
|
||||
edit_scroll(). (DLR, found by Daniel Richard G.)
|
||||
- Rename the DISABLE_ROOTWRAP #define to DISABLE_ROOTWRAPPING.
|
||||
(DLR)
|
||||
- browser.c:
|
||||
do_browser()
|
||||
- Refactor the mouse support, modeling it after do_mouse() for
|
||||
|
@ -134,7 +134,7 @@ fi])
|
||||
AC_ARG_ENABLE(wrapping-as-root,
|
||||
[ --disable-wrapping-as-root Disable wrapping of text as root by default],
|
||||
[if test x$enableval != xyes; then
|
||||
AC_DEFINE(DISABLE_ROOTWRAP, 1, [Define this to disable wrapping as root by default.])
|
||||
AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable wrapping as root by default.])
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE(color,
|
||||
|
@ -872,7 +872,7 @@ void version(void)
|
||||
#ifdef DISABLE_WRAPPING
|
||||
printf(" --disable-wrapping");
|
||||
#endif
|
||||
#ifdef DISABLE_ROOTWRAP
|
||||
#ifdef DISABLE_ROOTWRAPPING
|
||||
printf(" --disable-wrapping-as-root");
|
||||
#endif
|
||||
#ifdef ENABLE_COLOR
|
||||
@ -1742,7 +1742,7 @@ int main(int argc, char **argv)
|
||||
textdomain(PACKAGE);
|
||||
#endif
|
||||
|
||||
#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAP)
|
||||
#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)
|
||||
@ -2007,7 +2007,7 @@ int main(int argc, char **argv)
|
||||
tabsize = tabsize_cpy;
|
||||
flags |= flags_cpy;
|
||||
}
|
||||
#ifdef DISABLE_ROOTWRAP
|
||||
#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)
|
||||
|
@ -882,7 +882,7 @@ void do_rcfile(void)
|
||||
#endif
|
||||
);
|
||||
|
||||
#ifdef DISABLE_ROOTWRAP
|
||||
#ifdef DISABLE_ROOTWRAPPING
|
||||
/* We've already read SYSCONFDIR/nanorc, if it's there. If we're
|
||||
* root, and --disable-wrapping-as-root is used, turn wrapping off
|
||||
* now. */
|
||||
|
Loading…
Reference in New Issue
Block a user