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

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
master
David Lawrence Ramsey 2006-07-19 15:50:19 +00:00
parent 23994bd8a0
commit e53e12559f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -41,6 +41,8 @@ CVS code -
curses.h, which breaks compilation there. Changes to curses.h, which breaks compilation there. Changes to
do_page_up(), do_page_down(), do_up(), do_down(), nano.h, and do_page_up(), do_page_down(), do_up(), do_down(), nano.h, and
edit_scroll(). (DLR, found by Daniel Richard G.) edit_scroll(). (DLR, found by Daniel Richard G.)
- Rename the DISABLE_ROOTWRAP #define to DISABLE_ROOTWRAPPING.
(DLR)
- browser.c: - browser.c:
do_browser() do_browser()
- Refactor the mouse support, modeling it after do_mouse() for - Refactor the mouse support, modeling it after do_mouse() for

2
configure.ac
View File

@ -134,7 +134,7 @@ fi])
AC_ARG_ENABLE(wrapping-as-root, AC_ARG_ENABLE(wrapping-as-root,
[ --disable-wrapping-as-root Disable wrapping of text as root by default], [ --disable-wrapping-as-root Disable wrapping of text as root by default],
[if test x$enableval != xyes; then [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]) fi])
AC_ARG_ENABLE(color, AC_ARG_ENABLE(color,

6
src/nano.c
View File

@ -872,7 +872,7 @@ void version(void)
#ifdef DISABLE_WRAPPING #ifdef DISABLE_WRAPPING
printf(" --disable-wrapping"); printf(" --disable-wrapping");
#endif #endif
#ifdef DISABLE_ROOTWRAP #ifdef DISABLE_ROOTWRAPPING
printf(" --disable-wrapping-as-root"); printf(" --disable-wrapping-as-root");
#endif #endif
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
@ -1742,7 +1742,7 @@ int main(int argc, char **argv)
textdomain(PACKAGE); textdomain(PACKAGE);
#endif #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 /* If we don't have rcfile support, --disable-wrapping-as-root is
* used, and we're root, turn wrapping off. */ * used, and we're root, turn wrapping off. */
if (geteuid() == NANO_ROOT_UID) if (geteuid() == NANO_ROOT_UID)
@ -2007,7 +2007,7 @@ int main(int argc, char **argv)
tabsize = tabsize_cpy; tabsize = tabsize_cpy;
flags |= flags_cpy; flags |= flags_cpy;
} }
#ifdef DISABLE_ROOTWRAP #ifdef DISABLE_ROOTWRAPPING
/* If we don't have any rcfiles, --disable-wrapping-as-root is used, /* If we don't have any rcfiles, --disable-wrapping-as-root is used,
* and we're root, turn wrapping off. */ * and we're root, turn wrapping off. */
else if (geteuid() == NANO_ROOT_UID) else if (geteuid() == NANO_ROOT_UID)

2
src/rcfile.c
View File

@ -882,7 +882,7 @@ void do_rcfile(void)
#endif #endif
); );
#ifdef DISABLE_ROOTWRAP #ifdef DISABLE_ROOTWRAPPING
/* We've already read SYSCONFDIR/nanorc, if it's there. If we're /* We've already read SYSCONFDIR/nanorc, if it's there. If we're
* root, and --disable-wrapping-as-root is used, turn wrapping off * root, and --disable-wrapping-as-root is used, turn wrapping off
* now. */ * now. */