From ba25d0df1d0bec5f6803f8b5082e78e73299cf7a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 25 Mar 2020 16:49:46 +0100 Subject: [PATCH] tweaks: fix twenty typos, in old Changelogs and in some comments They were found by a run of 'codespell' at https://fossies.org/. Reported-by: Jens Schleusener --- ChangeLog | 12 ++++++------ ChangeLog.1999-2006 | 4 ++-- ChangeLog.2007-2015 | 14 +++++++------- po/ChangeLog | 2 +- src/files.c | 2 +- src/move.c | 2 +- src/nano.c | 2 +- src/winio.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b6a7581..397435a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -249,7 +249,7 @@ Benno Schulenberg (166): docs: improve the description of which rc-files are read during startup docs: mention in the FAQ that auto-indentation is suppressed when pasting docs: mention that -D/--boldtext gets overridden by some nanorc options - docs: put the three new behaviors in a bulletted list, to catch the eye + docs: put the three new behaviors in a bulleted list, to catch the eye docs: stop saying that 'set fill' enables hard-wrapping -- it does not docs: use more generally available arrows in the cheatsheet feedback: ask a clearer question when a valid lock file is encountered @@ -636,7 +636,7 @@ Benno Schulenberg (60): tweaks: sort two keywords strictly alphabetically tweaks: speed up determining the width of plain ASCII characters tweaks: speed up the counting of the menu entries to be shown - tweaks: use a more effecient way to skip storing an empty file name + tweaks: use a more efficient way to skip storing an empty file name tweaks: use an early return when there is no tilde tweaks: use 'void' in prototypes of parameterless functions [coverity] usage: mark the -J/--guidestripe option plus argument as translatable @@ -1402,7 +1402,7 @@ Benno Schulenberg (87): tweaks: remove a check that was made redundant by the previous commit tweaks: remove a now-unused parameter from four functions tweaks: remove an unneeded check for NULL, and rename a parameter - tweaks: remove a stray file that was accidentally comitted + tweaks: remove a stray file that was accidentally committed tweaks: remove some old debugging code tweaks: rename a bunch of variables, to make it clearer what they contain tweaks: rename a flag, to match the name of the option @@ -1917,7 +1917,7 @@ Benno Schulenberg (65): undo: when redoing, don't try to find a line number that might not exist Brand Huntsman (1): - color: remove unneeded bright comparision to prevent duplicate pairs + color: remove unneeded bright comparison to prevent duplicate pairs David Lawrence Ramsey (3): docs: mention that errorcolor does have default colors @@ -2141,7 +2141,7 @@ Benno Schulenberg (103): docs: mention that macros work correctly only on terminal emulators docs: remove another remark about indenting lacking undo capability docs: update references to the nanorc files for the XDG changes - files: avoid an abortion when excuting a command in a new buffer + files: avoid an abortion when executing a command in a new buffer gnulib: update to its current upstream state help: don't fall back to other syntaxes if there is no nanohelp one history: after loading the lists, mark them as unchanged @@ -2237,7 +2237,7 @@ Brand Huntsman (3): David Lawrence Ramsey (18): build: add history.c to the list of files with translatable strings display: don't cut off zero-width characters at the end of a chunk - docs: decribe the bindable functions 'recordmacro' and 'runmacro' + docs: describe the bindable functions 'recordmacro' and 'runmacro' docs: document the more everyday names of three bindable functions docs: remove man page reference to indent/unindent lacking undo/redo files: don't change file format when inserting into an existing buffer diff --git a/ChangeLog.1999-2006 b/ChangeLog.1999-2006 index 0b0d58cb..471a7d59 100644 --- a/ChangeLog.1999-2006 +++ b/ChangeLog.1999-2006 @@ -3007,7 +3007,7 @@ GNU nano 1.3.5 - 2004.11.22 - Don't change the file format when we insert another file into the current one. (DLR) do_insertfile() - - Simplify by reusing variables whereever possible, and add a + - Simplify by reusing variables wherever possible, and add a parameter execute to indicate whether or not to be in "Execute Command" mode. (DLR) - Rework so that goto is no longer needed, using do_writeout() @@ -6847,7 +6847,7 @@ nano-1.0.0 - 2001.03.22 edit update. Fixes bug #57. - search.c: print_replaced() - - s/occurence/occurrence typos. (Jordi) + - Fix typos in "occurrence". (Jordi) search_init() - If using Pico mode and regex and same answer is entered, use last_search string instead of answer. Fixes bug #56. diff --git a/ChangeLog.2007-2015 b/ChangeLog.2007-2015 index 4fe1eb98..08bf1778 100644 --- a/ChangeLog.2007-2015 +++ b/ChangeLog.2007-2015 @@ -330,7 +330,7 @@ GNU nano 2.5.2 - 2016.02.12 2016-02-09 Benno Schulenberg * src/files.c (stat_with_alloc, open_buffer, write_file): Check the - result of a stat() to avoid referencing unitialized data. Original + result of a stat() to avoid referencing uninitialized data. Original patch was by Kamil Dudka. * doc/man/{nano.1,rnano.1,nanorc.5}: Adjust version for release. @@ -661,7 +661,7 @@ GNU nano 2.5.0 - 2015.12.05 This addresses Debian bug #805288. 2015-12-01 Benno Schulenberg - * src/files.c (do_insertfile): Mark the buffer as mofified only when + * src/files.c (do_insertfile): Mark the buffer as modified only when actually something was inserted. This fixes Savannah bug #45409. * src/files.c (do_insertfile): Rename two variables for clarity. * src/text.c (redo_cut): Delete two redundant assignments. @@ -1305,7 +1305,7 @@ GNU nano 2.4.2 - 2015.07.05 * src/text.c (do_alt_speller, do_linter, do_formatter): Distinguish a failure to launch the linter from receiving zero parsable lines; add a new function to glue together the invocation-error string. - * src/global.c (shortcut_init): In the Help Viewer and File Browswer, + * src/global.c (shortcut_init): In the Help Viewer and File Browser, bind the unbound Home and End keys to goto_top and goto_bottom, to mimic the behaviour of these keys in file viewers and web browsers. Also show ^Y and ^V in the WhereisFile menu instead of M-\ and M-/, @@ -2005,7 +2005,7 @@ GNU nano 2.3.4 - 2014.06.02 2014-06-02 Chris Allegretta * doc/syntax/default.nanorc: Can't do trailing spaces in the - default syntax or it will hilight the spaces as you type them + default syntax or it will highlight the spaces as you type them into a new file, which for non-programming is infuriating. 2014-05-29 Mark Majeres @@ -3455,7 +3455,7 @@ GNU nano 2.1.8 - 2009.02.07 multi-line regexes but this may not be enough to increase performance. * Add interruptability to search functions. New functions enable_nodelay and disable_nodelay and changes to the routines to handle checking for pending - searches. Fixes Savannah bug #24946: Need interrrupt for search. + searches. Fixes Savannah bug #24946: Need interrupt for search. 2009-01-19 Chris Allegretta * Change function definitions to shorts instead of (void *)s. New mapping function @@ -3494,7 +3494,7 @@ GNU nano 2.1.6 - 2008.10.03 * ocaml.nanorc: Sample OCaml syntax highlighting file. 2008-09-30 Dave Geering - * objc.nanorc: Sample Objective-C syntax hightlighting file. + * objc.nanorc: Sample Objective-C syntax highlighting file. 2008-09-30 Chris Allegretta * configure.ac: Change extra, multibuffer, color and rcfile configure options @@ -3648,7 +3648,7 @@ GNU nano 2.1.1 - 2008.04.01 * gentoo.nanorc: Gentoo syntax highlighting config. 2008-03-17 Benno Schulenberg - * global.c: Fix incorrect first line jump messsage, fix + * global.c: Fix incorrect first line jump message, fix more comments to assist translators. * winio.c: Fix shortcut labels not being translated. diff --git a/po/ChangeLog b/po/ChangeLog index 77577993..4c1f6204 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -745,7 +745,7 @@ 2002-07-30 Jordi Mallach * pl.po: Updated translation by Wojciech Kotwica. - * sv.po: Upadted translation by Christian Rose. + * sv.po: Updated translation by Christian Rose. 2002-07-29 Jordi Mallach diff --git a/src/files.c b/src/files.c index 5d0c6520..cbeba2ed 100644 --- a/src/files.c +++ b/src/files.c @@ -2400,7 +2400,7 @@ bool is_dir(const char *path) * adapted from busybox 0.46 (cmdedit.c). Here is the notice from that * file, with the copyright years updated: * - * Termios command line History and Editting, originally + * Termios command line History and Editing, originally * intended for NetBSD sh (ash) * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 * Main code: Adam Rogoyski diff --git a/src/move.c b/src/move.c index 88b2261b..1657bda9 100644 --- a/src/move.c +++ b/src/move.c @@ -437,7 +437,7 @@ void do_home(void) } /* Move to the end of the current line (or softwrapped chunk). - * When softwrapping and alredy at the end of a chunk, go to the + * When softwrapping and already at the end of a chunk, go to the * end of the full line. */ void do_end(void) { diff --git a/src/nano.c b/src/nano.c index 4ea191f4..86307021 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1323,7 +1323,7 @@ int get_keycode(const char *keyname, const int standard) } #ifdef ENABLE_LINENUMBERS -/* Ensure that the margin can accomodate the buffer's highest line number. */ +/* Ensure that the margin can accommodate the buffer's highest line number. */ void confirm_margin(void) { int needed_margin = digits(openfile->filebot->lineno) + 1; diff --git a/src/winio.c b/src/winio.c index b7f533ab..4b9e9ea7 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2289,7 +2289,7 @@ void post_one_key(const char *keystroke, const char *tag, int width) waddnstr(bottomwin, keystroke, actual_x(keystroke, width)); wattroff(bottomwin, interface_color_pair[KEY_COMBO]); - /* If the remaning space is too small, skip the description. */ + /* If the remaining space is too small, skip the description. */ width -= breadth(keystroke); if (width < 2) return;