From: David Lawrence Ramsey Date: Fri, 28 Jul 2006 17:06:27 +0000 (+0000) Subject: per Benno Schulenberg's patch with a few additions by me, fix X-Git-Tag: v1.9.99pre1~41 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b159f941e8f02851e886f9dfda8faa800b30bd96;p=nano.git per Benno Schulenberg's patch with a few additions by me, fix punctuation relating to "i.e." in comments and documentation git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3821 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index b68f3e81..0aaa282e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,8 @@ CVS code - - When using slang 2.x, call SLutf8_enable() with an argument of 1 instead of TRUE, as that's the proper way to enable its UTF-8 support. Changes to main() and configure.ac. (DLR) + - Fix punctuation relating to "i.e." in comments and + documentation. (Benno Schulenberg and DLR) - browser.c: do_browser() - Refactor the mouse support, modeling it after do_mouse() for @@ -3364,7 +3366,7 @@ GNU nano 1.3.3 - 2004.06.28 do_justify(); new functions do_justify_void() and do_full_justify(). (DLR) - Modify the justification algorithm to work the same way as in - the current version of Pico, i.e, add a space at the end of + the current version of Pico, i.e. add a space at the end of each line of the justified paragraph except for the last one, and if there was a space at the end of the last one, remove it. Changes to justify_format() and do_justify(). Note that @@ -3792,7 +3794,7 @@ GNU nano 1.3.2 - 2004.03.31 - Change instances in the code that refresh the entire edit window when color support is enabled (in order to properly handle multi-line color regexes) to only do so when - it's necessary, i.e, when COLOR_SYNTAX is set. (DLR) + it's necessary, i.e. when COLOR_SYNTAX is set. (DLR) - Minor cosmetic tweaks to the code involving direction keys. NANO_UP_KEY and NANO_DOWN_KEY are now NANO_PREVLINE_KEY and NANO_NEXTLINE_KEY, and the help messages for them have been @@ -3804,7 +3806,7 @@ GNU nano 1.3.2 - 2004.03.31 the statusbar input routines to handle them and NANO_HELP_FKEY properly. (DLR) - Block SIGWINCH after setting up its handler, and only unblock - and handle it when we're in a stable state, i.e, when we're + and handle it when we're in a stable state, i.e. when we're waiting for input from the user. New function allow_pending_sigwinch(); changes to signal_init(), get_kbinput(), and get_verbatim_kbinput(). (DLR) @@ -4014,7 +4016,7 @@ GNU nano 1.3.2 - 2004.03.31 - Don't use "kbinput = wgetch(win)" as a switch value. (DLR) get_escape_seq_kbinput() - Add support for the escape sequences for F1-F14 whenever - possible (i.e, whenever a conflict doesn't occur), some + possible (i.e. whenever a conflict doesn't occur), some additional comments, and a few cosmetic cleanups. (DLR) - Use switch statements instead of strncmp() to read in the long xterm sequences for Ctrl-[arrow key] and Shift-[arrow key]. @@ -4043,7 +4045,7 @@ GNU nano 1.3.2 - 2004.03.31 do_credits() - Use nanosleep() instead of usleep(). The latter is only standard under BSD, whereas the former is POSIX compliant. - Accordingly, only include time.h if we use this function, i.e, + Accordingly, only include time.h if we use this function, i.e. if NANO_EXTRA is defined. (DLR) - Add explanatory comment. (DLR) - configure.ac: diff --git a/NEWS b/NEWS index 39d08b83..5b5eb8f0 100644 --- a/NEWS +++ b/NEWS @@ -229,7 +229,7 @@ broken regex detection, search history recall, and keypad handling with -K. Debugging strings are no longer translated and comments denote where translations - should be as short as possible (i.e, the statusbar). + should be as short as possible (i.e. the statusbar). There are new examples for syntax highlighting, and documentation updates and fixes. The 1.3.0 CVS tree will be opening soon for all your nano desires, so stay @@ -362,7 +362,7 @@ mode (^O,M-P), a new "syntax" command in the .nanorc to allow multiple syntax highlighting types, and a new -Y, --syntax flag to set a specific one if there's no - filename regex to match it against (i.e, w/mutt). The + filename regex to match it against (i.e. w/mutt). The ^space and M-space keys will now show up in the help menu, which itself has been tweaked a bit, and many more configure options should now cooperate (like the odd @@ -542,7 +542,7 @@ resizing the editor in any mode other than normal edit mode. Other fixes include some more tab completion segfaults, and an silly segfault that occurred when - successfully writing a file on the 2nd try (i.e, after + successfully writing a file on the 2nd try (i.e. after an initial write error). Slowly but surely, on toward 1.0 we travel. @@ -730,7 +730,7 @@ 05/14/2000 - Nano 0.9.7 (the Mother's Day release) continues in the long line of display fixes, and also fixes the broken symlink - behavior (i.e, symlinks weren't being followed by + behavior (i.e. symlinks weren't being followed by default). Hopefully all major bugs can be worked out soon and we can have a 1.0 release before the end of the year, but who knows. @@ -783,7 +783,7 @@ 04/14/2000 - 0.9.1 has some more Pico compatibility built-in. The option to switch to/from Search and Search/Replace (^T) is now available, and nano now displays the more - Pico-like shortcut list when invoked as 'pico' (i.e, if + Pico-like shortcut list when invoked as 'pico' (i.e. if 'pico' is a symlink to nano). There is an important change to the handling of symbolic links as well. Now, nano does the "correct" thing and automatically writes diff --git a/README.CVS b/README.CVS index e05eca82..6ef63c9d 100644 --- a/README.CVS +++ b/README.CVS @@ -80,7 +80,7 @@ Then, once it's done compiling, run $ make install -which should copy various files (i.e, the nano executable, the info and +which should copy various files (i.e. the nano executable, the info and man pages, and syntax highlighting pattern files) to their appropriate directories. diff --git a/src/browser.c b/src/browser.c index 94003a63..2ae949a3 100644 --- a/src/browser.c +++ b/src/browser.c @@ -626,7 +626,7 @@ void browser_refresh(void) bool dots = (COLS >= 15 && filetaillen >= longest - foomaxlen - 1); /* Do we put an ellipsis before the filename? Don't set - * this to TRUE if we have fewer than 15 columns (i.e, 1 + * this to TRUE if we have fewer than 15 columns (i.e. 1 * column for padding, plus 7 columns for a filename * other than ".."). */ char *disp = display_string(filetail, dots ? filetaillen - @@ -655,7 +655,7 @@ void browser_refresh(void) /* Show information about the file. We don't want to report * file sizes for links, so we use lstat(). */ if (lstat(filelist[i], &st) == -1 || S_ISLNK(st.st_mode)) { - /* If the file doesn't exist (i.e, it's been deleted while + /* If the file doesn't exist (i.e. it's been deleted while * the file browser is open), or it's a symlink that doesn't * point to a directory, display "--". */ if (stat(filelist[i], &st) == -1 || !S_ISDIR(st.st_mode)) diff --git a/src/cut.c b/src/cut.c index 63267a29..13c79f44 100644 --- a/src/cut.c +++ b/src/cut.c @@ -90,7 +90,7 @@ void cut_to_eol(void) else if (openfile->current != openfile->filebot) { /* If we're at the end of the line, and it isn't the last line * of the file, move all the text from the current position up - * to the beginning of the next line, i.e, the newline at the + * to the beginning of the next line, i.e. the newline at the * end, into the cutbuffer. */ move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, openfile->current_x, openfile->current->next, 0); diff --git a/src/files.c b/src/files.c index a6e9baf7..4128aba0 100644 --- a/src/files.c +++ b/src/files.c @@ -540,7 +540,7 @@ void read_file(FILE *f, const char *filename) openfile->filebot); /* If the NO_NEWLINES flag isn't set, and text has been added to - * the magicline (i.e, a file that doesn't end in a newline has been + * the magicline (i.e. a file that doesn't end in a newline has been * inserted at the end of the current buffer), add a new magicline, * and move the current line down to it. */ if (!ISSET(NO_NEWLINES) && openfile->filebot->data[0] != '\0') { @@ -2299,7 +2299,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool assert(longest_name <= COLS - 1); - /* Each column will be (longest_name + 2) columns wide, i.e, + /* Each column will be (longest_name + 2) columns wide, i.e. * two spaces between columns, except that there will be * only one space after the last column. */ columns = (COLS + 1) / (longest_name + 2); diff --git a/src/global.c b/src/global.c index 8c686781..66ba316f 100644 --- a/src/global.c +++ b/src/global.c @@ -54,7 +54,7 @@ WINDOW *topwin; * number of nano, the name of the current file, and whether the * current file has been modified. */ WINDOW *edit; - /* The middle portion of the window, i.e, the edit window, where + /* The middle portion of the window, i.e. the edit window, where * we display the current file we're editing. */ WINDOW *bottomwin; /* The bottom portion of the window, where we display statusbar diff --git a/src/prompt.c b/src/prompt.c index c46da390..ee1440ed 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -839,7 +839,7 @@ void do_statusbar_find_bracket(void) } #endif /* !NANO_TINY */ -/* Return the placewewant associated with statusbar_x, i.e, the +/* Return the placewewant associated with statusbar_x, i.e. the * zero-based column position of the cursor. The value will be no * smaller than statusbar_x. */ size_t statusbar_xplustabs(void) @@ -1323,7 +1323,7 @@ int do_yesno_prompt(bool all, const char *msg) editwinrows - 1; /* Calculate the y-coordinate relative to the * beginning of the Yes/No/All shortcuts in - * bottomwin, i.e, with the sizes of topwin, + * bottomwin, i.e. with the sizes of topwin, * edit, and the first line of bottomwin * subtracted out. */ diff --git a/src/text.c b/src/text.c index 88b39b05..463fd6de 100644 --- a/src/text.c +++ b/src/text.c @@ -1942,7 +1942,7 @@ const char *do_int_speller(const char *tempfile_name) /* A new process to run spell in. */ if ((pid_spell = fork()) == 0) { - /* Child continues (i.e, future spell process). */ + /* Child continues (i.e. future spell process). */ close(spell_fd[0]); /* Replace the standard input with the temp file. */ @@ -1972,7 +1972,7 @@ const char *do_int_speller(const char *tempfile_name) /* A new process to run sort in. */ if ((pid_sort = fork()) == 0) { - /* Child continues (i.e, future spell process). Replace the + /* Child continues (i.e. future spell process). Replace the * standard input with the standard output of the old pipe. */ if (dup2(spell_fd[0], STDIN_FILENO) != STDIN_FILENO) goto close_pipes_and_exit; @@ -1998,7 +1998,7 @@ const char *do_int_speller(const char *tempfile_name) /* A new process to run uniq in. */ if ((pid_uniq = fork()) == 0) { - /* Child continues (i.e, future uniq process). Replace the + /* Child continues (i.e. future uniq process). Replace the * standard input with the standard output of the old pipe. */ if (dup2(sort_fd[0], STDIN_FILENO) != STDIN_FILENO) goto close_pipes_and_exit; diff --git a/src/utils.c b/src/utils.c index b6be0ee5..9e4da45d 100644 --- a/src/utils.c +++ b/src/utils.c @@ -425,7 +425,7 @@ size_t get_page_start(size_t column) return column - (COLS - 2); } -/* Return the placewewant associated with current_x, i.e, the zero-based +/* Return the placewewant associated with current_x, i.e. the zero-based * column position of the cursor. The value will be no smaller than * current_x. */ size_t xplustabs(void) @@ -434,7 +434,7 @@ size_t xplustabs(void) } /* Return the index in s of the character displayed at the given column, - * i.e, the largest value such that strnlenpt(s, actual_x(s, column)) <= + * i.e. the largest value such that strnlenpt(s, actual_x(s, column)) <= * column. */ size_t actual_x(const char *s, size_t column) { diff --git a/src/winio.c b/src/winio.c index 64820e79..06328a2a 100644 --- a/src/winio.c +++ b/src/winio.c @@ -653,7 +653,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key) #endif } - /* If our result is an extended keypad value (i.e, a value + /* If our result is an extended keypad value (i.e. a value * outside of byte range), set func_key to TRUE. */ if (retval != ERR) *func_key = !is_byte(retval); @@ -1606,7 +1606,7 @@ bool get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts) i = COLS / ((currslen / 2) + (currslen % 2)); /* Calculate the y-coordinate relative to the beginning of - * the shortcut list in bottomwin, i.e, with the sizes of + * the shortcut list in bottomwin, i.e. with the sizes of * topwin, edit, and the first line of bottomwin subtracted * out, and set j to it. */ j = *mouse_y - (2 - no_more_space()) - editwinrows - 1; @@ -1754,7 +1754,7 @@ void blank_topbar(void) blank_line(topwin, 1, 0, COLS); } -/* Blank all the lines of the middle portion of the window, i.e, the +/* Blank all the lines of the middle portion of the window, i.e. the * edit window. */ void blank_edit(void) { @@ -2096,7 +2096,7 @@ void titlebar(const char *path) if (!newfie) { size_t lenpt = strlenpt(path), start_col; - /* Don't set dots to TRUE if we have fewer than 8 columns (i.e, + /* Don't set dots to TRUE if we have fewer than 8 columns (i.e. * 1 column for padding, plus 7 columns for a filename). */ dots = (space >= 8 && lenpt >= space);