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

Replacing SYSCONFDIR with an absolute path or a circumlocution, 

as suggested by Mike Frysinger, plus some other tweaks.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4977 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-06-17 20:30:59 +00:00
parent e96022b923
commit b439f55678
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -4,6 +4,9 @@
2014-06-17 Benno Schulenberg <bensberg@justemail.net> 2014-06-17 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_undo, do_redo): Remove obsolete boolean variable. * src/text.c (do_undo, do_redo): Remove obsolete boolean variable.
* doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Replace
SYSCONFDIR with an absolute path or a circumlocution, as suggested
by Mike Frysinger, plus some other tweaks.
2014-06-16 David Lawrence Ramsey <pooka109@gmail.com> 2014-06-16 David Lawrence Ramsey <pooka109@gmail.com>
* src/nano.c (do_exit): Display the message "No file name" on the * src/nano.c (do_exit): Display the message "No file name" on the

11
doc/man/nano.1
View File

@ -78,7 +78,7 @@ Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
retrieved in later sessions (if \fInanorc\fP support has been compiled in). retrieved in later sessions (if \fInanorc\fP support has been compiled in).
.TP .TP
.B \-I (\-\-ignorercfiles) .B \-I (\-\-ignorercfiles)
Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP Don't look at the system's \fBnanorc\fP nor at \fB~/.nanorc\fP
(if \fInanorc\fP support has been compiled in). (if \fInanorc\fP support has been compiled in).
.TP .TP
.B \-K (\-\-rebindkeypad) .B \-K (\-\-rebindkeypad)
@ -228,13 +228,14 @@ Ignored, for compatibility with Pico.
.SH INITIALIZATION FILE .SH INITIALIZATION FILE
\fBnano\fP will read initialization files in the following order: \fBnano\fP will read initialization files in the following order:
\fISYSCONFDIR/nanorc\fP, then \fI~/.nanorc\fP. Please see the system's \fBnanorc\fP (if it exists), and then the user's
\fBnanorc(5)\fP and the example file \fBnanorc.sample\fP, both of which \fB~/.nanorc\fP (if it exists). Please see
should be provided with \fBnano\fP. .BR nanorc (5)
for more information on the possible contents of those files.
.SH NOTES .SH NOTES
If no alternative spell checker command is specified on the command If no alternative spell checker command is specified on the command
line or in one of the \fInanorc\fP files, \fBnano\fP will check the line nor in one of the \fInanorc\fP files, \fBnano\fP will check the
\fBSPELL\fP environment variable for one. \fBSPELL\fP environment variable for one.
In some cases \fBnano\fP will try to dump the buffer into an emergency In some cases \fBnano\fP will try to dump the buffer into an emergency

10
doc/man/nanorc.5
View File

@ -29,8 +29,8 @@ nanorc \- GNU nano's rcfile
The \fInanorc\fP file contains the default settings for \fBnano\fP, a The \fInanorc\fP file contains the default settings for \fBnano\fP, a
small and friendly editor. The file should be in Unix format, not in small and friendly editor. The file should be in Unix format, not in
DOS or Mac format. During startup, \fBnano\fP will first read the DOS or Mac format. During startup, \fBnano\fP will first read the
system-wide settings, from \fBSYSCONFDIR/nanorc\fP, and then the system-wide settings, from \fB/etc/nanorc\fP (the exact path might be
user-specific settings, from \fB~/.nanorc\fP. different), and then the user-specific settings, from \fB~/.nanorc\fP.
.SH OPTIONS .SH OPTIONS
The configuration file accepts a series of \fBset\fP and \fBunset\fP The configuration file accepts a series of \fBset\fP and \fBunset\fP
@ -648,11 +648,11 @@ A special name meaning: apply to all menus where this function exists.
.SH FILES .SH FILES
.TP .TP
.B SYSCONFDIR/nanorc .B /etc/nanorc
System-wide configuration file System-wide configuration file.
.TP .TP
.B ~/.nanorc .B ~/.nanorc
Per-user configuration file Per-user configuration file.
.SH SEE ALSO .SH SEE ALSO
.TP .TP
\fBnano\fP(1) \fBnano\fP(1)

7
doc/texinfo/nano.texi
View File

@ -158,7 +158,7 @@ Log search and replace strings to ~/.nano/search_history, so they can be
retrieved in later sessions (if nanorc support has been compiled in). retrieved in later sessions (if nanorc support has been compiled in).
@item -I, --ignorercfiles @item -I, --ignorercfiles
Don't look at SYSCONFDIR/nanorc or ~/.nanorc Don't look at the system's nanorc file nor at the user's ~/.nanorc
(if nanorc support has been compiled in). (if nanorc support has been compiled in).
@item -K, --rebindkeypad @item -K, --rebindkeypad
@ -521,8 +521,9 @@ toggles the -$ (@code{--softwrap}) command line option.
The nanorc files contain the default settings for @code{nano}. They The nanorc files contain the default settings for @code{nano}. They
should be in Unix format, not in DOS or Mac format. During startup, should be in Unix format, not in DOS or Mac format. During startup,
@code{nano} will first read the system-wide settings, from SYSCONFDIR/nanorc, @code{nano} will first read the system-wide settings, from /etc/nanorc
and then the user-specific settings, from ~/.nanorc. (the exact path might be different), and then the user-specific settings,
from ~/.nanorc.
A nanorc file accepts a series of "set" and "unset" commands, which can A nanorc file accepts a series of "set" and "unset" commands, which can
be used to configure @code{nano} on startup without using command-line be used to configure @code{nano} on startup without using command-line