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

2014-03-01 Chris Allegretta <chrisa@asty.org> 

* global.c (shortcut_init) - Don't actually free the shortcut
          list, since the next pass via justifying will then remove
          all custom shortcuts.  Fixed bug discovered by Benno Schulenberg.
        * text.c (do_linter) - Remove some unused variables to quiet
          -pedanic -Wall.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4637 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2014-03-04 03:55:43 +00:00
parent c347ce44a3
commit 3a5f55e439
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-01 Chris Allegretta <chrisa@asty.org>
* global.c (shortcut_init) - Don't actually free the shortcut
list, since the next pass via justifying will then remove
all custom shortcuts. Fixed bug discovered by Benno Schulenberg.
* text.c (do_linter) - Remove some unused variables to quiet
-pedanic -Wall.
2014-03-03 Benno Schulenberg <bensberg@justemail.net> 2014-03-03 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (add_to_funcs) - Add a newline, for clarity. * src/global.c (add_to_funcs) - Add a newline, for clarity.
* src/global.c (shortcut_init) - Mark, don't translate yet. * src/global.c (shortcut_init) - Mark, don't translate yet.

6
src/global.c
View File

@ -1128,12 +1128,6 @@ void shortcut_init(bool unjustify)
currmenu = MMAIN; currmenu = MMAIN;
while (sclist != NULL) {
sc *s = sclist;
sclist = (s)->next;
free(s);
}
add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MLINTER, add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MLINTER,
"^G", do_help_void, 0, TRUE); "^G", do_help_void, 0, TRUE);
add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MLINTER, add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MLINTER,

4
src/text.c
View File

@ -2984,12 +2984,11 @@ void do_linter(void)
char *read_buff, *read_buff_ptr, *read_buff_word, *ptr; char *read_buff, *read_buff_ptr, *read_buff_word, *ptr;
size_t pipe_buff_size, read_buff_size, read_buff_read, bytesread; size_t pipe_buff_size, read_buff_size, read_buff_read, bytesread;
size_t parsesuccess = 0; size_t parsesuccess = 0;
int lint_fd[2], tempfile_fd = -1; int lint_fd[2];
pid_t pid_lint; pid_t pid_lint;
int lint_status; int lint_status;
static int arglen = 3; static int arglen = 3;
static char **lintargs = NULL; static char **lintargs = NULL;
FILE *temp_file;
char *lintcopy; char *lintcopy;
char *convendptr = NULL; char *convendptr = NULL;
const sc *s; const sc *s;
@ -3186,7 +3185,6 @@ void do_linter(void)
ssize_t tmpcol = 1; ssize_t tmpcol = 1;
int kbinput; int kbinput;
bool meta_key, func_key; bool meta_key, func_key;
struct stat lintfileinfo;
if (curlint->colno > 0) if (curlint->colno > 0)
tmpcol = curlint->colno; tmpcol = curlint->colno;