diff options
author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-11-18 16:28:49 +0300 |
---|---|---|
committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2024-11-18 16:30:59 +0300 |
commit | 52d66c5783d39a23027102c3087eac8ef1c0f02f (patch) | |
tree | 6f75f5af844e4110ebea49954be8b966d4351f0f | |
parent | 02ab80c1f94ef89f5cf247a6d8baa7e612e51f25 (diff) | |
download | sciteco-52d66c5783d39a23027102c3087eac8ef1c0f02f.tar.gz |
fixed some common typos: "ie." and "eg.", "ocur" instead of "occur"
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | doc/cheat-sheet.mm | 26 | ||||
-rwxr-xr-x | doc/grosciteco.tes | 2 | ||||
-rw-r--r-- | doc/sciteco.7.template | 8 | ||||
-rw-r--r-- | doc/tedoc.tes.1.in | 2 | ||||
-rw-r--r-- | src/file-utils.c | 2 | ||||
-rw-r--r-- | src/interface-curses/curses-icons.c | 2 | ||||
-rw-r--r-- | src/interface-curses/interface.c | 2 | ||||
-rw-r--r-- | src/memory.c | 10 | ||||
-rw-r--r-- | src/parser.h | 6 | ||||
-rw-r--r-- | src/spawn.c | 2 | ||||
-rw-r--r-- | src/symbols.c | 2 | ||||
-rw-r--r-- | src/undo.c | 2 |
14 files changed, 36 insertions, 36 deletions
@@ -65,7 +65,7 @@ Features the command line, making it harder to write incorrect interactive macros. Context-sensitive immediate editing commands also make it much harder to destroy a day's work by accident than in classic TECOs. - Also, SciTECO supports many types of context-sensitive auto-completions (ie. the Tab-key): + Also, SciTECO supports many types of context-sensitive auto-completions (i.e. the Tab-key): Q-Register names, file names, directories, goto labels, help topics... * Command rubout: SciTECO can undo almost every side effect, including file writes (`EW` command). diff --git a/configure.ac b/configure.ac index 12faf4c..32e9612 100644 --- a/configure.ac +++ b/configure.ac @@ -341,7 +341,7 @@ case $INTERFACE in # This is detectable at runtime on PDCursesMod using PDC_get_version(). # "Classic" PDCurses however does not allow runtime or compile-time checks for - # discerning eg. WinCon from SDL. + # discerning e.g. WinCon from SDL. if [[ $INTERFACE = pdcurses-gui ]]; then AC_DEFINE(PDCURSES_GUI, 1, [PDCurses with GUI window]) fi @@ -423,7 +423,7 @@ if [[ $malloc_replacement = yes ]]; then AC_DEFINE(HAVE_MALLOC_TRIM, 1, [Define to 1 if you have the `malloc_trim' function.]) else # NOTE: We don't check for malloc_footprint() since even if existing, - # it cannot be guaranteed to work (eg. as in dlmalloc with HAVE_MORECORE=1). + # it cannot be guaranteed to work (e.g. as in dlmalloc with HAVE_MORECORE=1). AC_CHECK_HEADERS([malloc.h malloc_np.h]) AC_CHECK_FUNCS([malloc_trim], [ AC_CHECK_DECLS([malloc_trim], , , [ diff --git a/doc/cheat-sheet.mm b/doc/cheat-sheet.mm index ea0d893..28ecad9 100644 --- a/doc/cheat-sheet.mm +++ b/doc/cheat-sheet.mm @@ -122,7 +122,7 @@ Ctrl+\fIX\fP, but can also be typed with a caret (\fC^\fP). . TD \*[CTRL LF] . TD -Line Feed, ie. Enter/Return key +Line Feed, i.e. Enter/Return key . TR bgc=grey90 . TD colspan=4 For instance: @@ -157,7 +157,7 @@ Exit, but only if no buffer is \(lqdirty\(rq (unsaved) . TD \fC-EX\fP\*($$ . TD -Exit even if buffer is \(lqdirty\(rq, ie. discarding all unsaved changes. +Exit even if buffer is \(lqdirty\(rq, i.e. discarding all unsaved changes. . TRX . TD \fC:EX\fP\*($$ @@ -235,7 +235,7 @@ Finish (close) current buffer, discarding all unsaved changes. . TD \fCFG\fIpath\fR\*$ . TD -Go to folder \fIpath\fP, ie. change working directory. +Go to folder \fIpath\fP, i.e. change working directory. . TRX . TD . CI 0EE @@ -435,7 +435,7 @@ Move to the beginning of next line. . TD . CI "" n L . TD -Move fordware \fIn\fP lines. +Move forward \fIn\fP lines. . TRX . TD . CI 0L @@ -525,17 +525,17 @@ Discard command-line, storing it in \fIq\fP. . TD \fCS\fItext\*$ . TD -Search for next ocurrence of \fItext\fP. +Search for next occurrence of \fItext\fP. . TRX . TD \fC-S\fItext\*$ . TD -Search for previous ocurrence of \fItext\fP. +Search for previous occurrence of \fItext\fP. . TRX . TD \fIn\fCS\fItext\*$ . TD -Search for \fIn\fP-th ocurrence of \fItext\fP. +Search for \fIn\fP-th occurrence of \fItext\fP. . TRX . TD \fCS\*$ @@ -545,12 +545,12 @@ Repeat last search (pattern from Q-Register \fC_\fP). . TD \fCN\fItext\*$ . TD -Search for next ocurrence of \fItext\fP across all buffers. +Search for next occurrence of \fItext\fP across all buffers. . TRX . TD \fCFR\fIfrom\*$\fIto\*$ . TD -Find next ocurrence of \fIfrom\fP and replace it with \fIto\fP. +Find next occurrence of \fIfrom\fP and replace it with \fIto\fP. . TRX . TD \fCFR\*($$ @@ -560,17 +560,17 @@ Repeat the last search-replace operation (\fC_\fP and \fC-\fP). . TD \fC<FR\fIfrom\*$\fIto\*$\fC;>\fP . TD -Find and replace all ocurrences in buffer beginning at current position. +Find and replace all occurrences in buffer beginning at current position. . TRX . TD \fCFK\fItext\*$ . TD -Find and kill (delete) up to first ocurrence of \fItext\fP. +Find and kill (delete) up to first occurrence of \fItext\fP. . TRX . TD \fCFD\fItext\*$ . TD -Find and delete first ocurrence of \fItext\fP. +Find and delete first occurrence of \fItext\fP. .ETB . .TBLX "Control Flow" width='45% 55%' @@ -645,7 +645,7 @@ Matches any character not in \fIclass\fP. . TD \*[CTRL ^E]\fCM\fIpattern\fP . TD -Matches many ocurrences of \fIpattern\fP. +Matches many occurrences of \fIpattern\fP. . TRX . TD \*[CTRL ^E]\fCG\fIq\fP diff --git a/doc/grosciteco.tes b/doc/grosciteco.tes index 54b3596..e5be8a9 100755 --- a/doc/grosciteco.tes +++ b/doc/grosciteco.tes @@ -271,7 +271,7 @@ EBN[input] !cmd.C! :M#sw 0A-^^u"= - !* FIXME: This can be CuXXXX_XXXX (decomposed, eg. for cyrillic й) *! + !* FIXME: This can be CuXXXX_XXXX (decomposed, e.g. for cyrillic й) *! C 16 \U.w W | .(:M#sa).X.w 0Q[glyphs.Q.w]U.w diff --git a/doc/sciteco.7.template b/doc/sciteco.7.template index 81deac0..d937ca2 100644 --- a/doc/sciteco.7.template +++ b/doc/sciteco.7.template @@ -159,7 +159,7 @@ codes, which is a subset of Unicode. \# editing commands from key macros. Since the \*(ST parser is Unicode-aware, this does not exclude using Unicode glyphs wherever a single character is expected, -ie. \fB^^\fIx\fR and \fBU\fIq\fR works with arbitrary Unicode glyphs. +i.e. \fB^^\fIx\fR and \fBU\fIq\fR works with arbitrary Unicode glyphs. All \*(ST macros must be in valid UTF-8. . .SS Key Macros @@ -1017,7 +1017,7 @@ T} .SCITECO_TT_END SP .LP .SCITECO_TOPIC associativity -All binary operators are \fIleft-associative\fP, ie. associate +All binary operators are \fIleft-associative\fP, i.e. associate from left to right, in \*(ST. .SCITECO_TOPIC ( ) brackets Round brackets may be used for grouping expressions to override @@ -1025,7 +1025,7 @@ operator precedence and associativity. For instance, since \(lq\fB^/\fP\(rq, \(lq\fB/\fP\(rq and \(lq\fB*\fP\(rq all have the same precedence, the expression \(lq1 ^/ 2 / 3 * 4\(rq is equivalent to \(lq(((1 ^/ 2) / 3) * 4)\(rq. -The opening bracket also represents an argument barrier, ie. the first +The opening bracket also represents an argument barrier, i.e. the first command after the opening bracket does not see and cannot pop any arguments from the stack. This may be useful for mixing commands with arithmetic expressions. @@ -1319,7 +1319,7 @@ but this may be changed using modifiers. If enabled, string arguments may contain special string building characters for instance to embed other strings or to quote the argument terminator. The detection of the end of a string is aware of string building characters, -ie. string building constructs may contain the current terminator. +i.e. string building constructs may contain the current terminator. String building may be enabled or disabled by default for a command. In interactive mode the command is often executed as soon as it has been completely specified and updates to the string arguments diff --git a/doc/tedoc.tes.1.in b/doc/tedoc.tes.1.in index 77b67d1..9f87b37 100644 --- a/doc/tedoc.tes.1.in +++ b/doc/tedoc.tes.1.in @@ -53,7 +53,7 @@ A man-page template, i.e. a man-page with the \fBTEDOC\fP request. .IP "\fIsources...\fP" An arbitrary number of source code files to scan through. -The comments are extracted in document order, ie. from the +The comments are extracted in document order, i.e. from the first comment in the first source file to the last comment in the last source file specified. . diff --git a/src/file-utils.c b/src/file-utils.c index 82df599..7839a38 100644 --- a/src/file-utils.c +++ b/src/file-utils.c @@ -314,7 +314,7 @@ teco_file_expand_path(const gchar *path) * If G_FILE_TEST_EXISTS, both files and directories are completed. * If G_FILE_TEST_IS_DIR, only directories will be completed. * @param insert String to initialize with the autocompletion. - * @return TRUE if the completion was unambiguous (eg. command can be terminated). + * @return TRUE if the completion was unambiguous (e.g. command can be terminated). */ gboolean teco_file_auto_complete(const gchar *filename, GFileTest file_test, teco_string_t *insert) diff --git a/src/interface-curses/curses-icons.c b/src/interface-curses/curses-icons.c index 1a1ba3a..e2e4256 100644 --- a/src/interface-curses/curses-icons.c +++ b/src/interface-curses/curses-icons.c @@ -38,7 +38,7 @@ typedef struct { * The following icons have initially been adapted from exa, * but icons have since been added and removed. * - * They require fonts with additional symbols, eg. + * They require fonts with additional symbols, e.g. * Nerd Fonts (https://www.nerdfonts.com/). * * They MUST be kept presorted, so we can perform binary searches. diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c index 075c9c7..5984bcb 100644 --- a/src/interface-curses/interface.c +++ b/src/interface-curses/interface.c @@ -98,7 +98,7 @@ #if defined(NCURSES_UNIX) || defined(NETBSD_CURSES) /** * Whether Curses works on a real or pseudo TTY - * (ie. classic use with terminal emulators on Unix) + * (i.e. classic use with terminal emulators on Unix) */ #define CURSES_TTY #endif diff --git a/src/memory.c b/src/memory.c index 26cde55..653d1ef 100644 --- a/src/memory.c +++ b/src/memory.c @@ -102,7 +102,7 @@ * * @par Size of the program break * There is also the old-school technique of calculating the size - * of the program break, ie. the effective size of the DATA segment. + * of the program break, i.e. the effective size of the DATA segment. * This works under the assumption that all allocations are * performed by extending the program break, as is __traditionally__ * done by malloc() and friends. @@ -156,7 +156,7 @@ * but obviously won't work for shared libraries. * - The portable dlsym() could be used to look up the original * library symbol, but it may and does call malloc functions, - * eg. calloc() on glibc. + * e.g. calloc() on glibc. * Some people work around this using bootstrap makeshift allocators * used only during dlsym(). * __In other words, there is no way to portably and reliably @@ -169,7 +169,7 @@ * Otherwise the measurement is not precise and there can even * be underruns. Thus we'd have to guard against underruns. * - Unfortunately, it is undefined whether the "usable" size of - * a heap object can change unwittingly, ie. not by malloc() or + * a heap object can change unwittingly, i.e. not by malloc() or * realloc() on that same heap object, but for instance after a * neighbouring heap object is freed. * If this can happen, free() on that heap object might subtract @@ -245,7 +245,7 @@ * optimization. * - This approach has the same disadvantages as wrapping malloc() because * of the unreliability of malloc_usable_size(). - * Furthermore, all allocations by glib (eg. g_strdup()) will be missed. + * Furthermore, all allocations by glib (e.g. g_strdup()) will be missed. * * @par Directly measuring the resident memory size * It is of course possible to query the program's RSS via OS APIs. @@ -280,7 +280,7 @@ * If disabled, we try to directly measure memory consumption using * OS APIs. * Polling of the RSS takes place in a dedicated thread that is started - * on demand and paused whenever the main thread is idle (eg. waits for + * on demand and paused whenever the main thread is idle (e.g. waits for * user input), so we don't waste cycles. */ diff --git a/src/parser.h b/src/parser.h index 53eb76b..3d69013 100644 --- a/src/parser.h +++ b/src/parser.h @@ -186,7 +186,7 @@ struct teco_state_t { teco_state_process_edit_cmd_cb_t process_edit_cmd_cb; /** - * Whether this state is a start state (ie. not within any + * Whether this state is a start state (i.e. not within any * escape sequence etc.). * This is separate of TECO_KEYMACRO_MASK_START which is set * only in the main machine's start states. @@ -432,7 +432,7 @@ typedef struct { } teco_machine_scintilla_t; typedef enum { - /** Normal parsing - ie. execute while parsing */ + /** Normal parsing - i.e. execute while parsing */ TECO_MODE_NORMAL = 0, /** Parse, but don't execute until reaching not-yet-defined Goto-label */ TECO_MODE_PARSE_ONLY_GOTO, @@ -448,7 +448,7 @@ typedef enum { struct teco_machine_main_t { teco_machine_t parent; - /** Program counter, ie. pointer to the next character in the current macro frame */ + /** Program counter, i.e. pointer to the next character in the current macro frame */ gsize macro_pc; /** diff --git a/src/spawn.c b/src/spawn.c index 9816975..16ab082 100644 --- a/src/spawn.c +++ b/src/spawn.c @@ -711,7 +711,7 @@ teco_spawn_stdin_watch_cb(GIOChannel *chan, GIOCondition condition, gpointer dat /* * This cares about automatic EOL conversion and * returns the number of consumed bytes. - * If it can only write a part of the EOL sequence (ie. CR of CRLF) + * If it can only write a part of the EOL sequence (i.e. CR of CRLF) * it may return a short byte count (possibly 0) which ensures that * we do not yet remove the source. */ diff --git a/src/symbols.c b/src/symbols.c index feead76..944d01d 100644 --- a/src/symbols.c +++ b/src/symbols.c @@ -286,7 +286,7 @@ gboolean teco_state_scintilla_symbols_process_edit_cmd(teco_machine_main_t *ctx, * * As a special exception, you can and must specify a * Lexilla lexer name as a string argument for the \fBSCI_SETILEXER\fP - * message, ie. in order to load a Lexilla lexer + * message, i.e. in order to load a Lexilla lexer * (this works similar to the old \fBSCI_SETLEXERLANGUAGE\fP message). * * .BR Warning : @@ -42,7 +42,7 @@ TECO_DEFINE_UNDO_SCALAR(gconstpointer); * An undo token. * * Undo tokens are generated to revert any - * changes to the editor state, ie. they + * changes to the editor state, i.e. they * define an action to take upon rubout. * * Undo tokens are organized into an undo stack. |