Skip to content

Commit 18b5371

Browse files
authored
Merge pull request #1621 from kianmeng/fix-typos
Fix typos
2 parents 7900707 + 3d1bc6e commit 18b5371

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

CHANGELOG

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ nnn v4.3 Martini
117117
- add `bookmarks` directory for flexible symlinked bookmarks
118118
- new key <kbd>B</kbd> to add a symlinked bookmark for current dir
119119
- special variables `$dN`, `$fN` available for plugins/prompt/shell to access
120-
dir/hovered file in each conext
120+
dir/hovered file in each context
121121
- config `NNN_ORDER` to set directory-specific ordering
122122
- show/hide hidden files as per context state in plugin based batch rename
123123
- retain search filter history for plugin `finder`

misc/macos-legacy/mach_gettime.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int clock_gettime(clockid_t clk_id, struct timespec *tp)
2424
double diff = (mach_absolute_time() - mt_timestart) * mt_timebase;
2525
tp->tv_sec = diff * MT_NANO;
2626
tp->tv_nsec = diff - (tp->tv_sec * MT_GIGA);
27-
} else { // other clk_ids are mapped to the coresponding mach clock_service
27+
} else { // other clk_ids are mapped to the corresponding mach clock_service
2828
clock_serv_t cclock;
2929
mach_timespec_t mts;
3030

misc/macos-legacy/mach_gettime.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
typedef int clockid_t;
1919

2020
/* the mach kernel uses struct mach_timespec, so struct timespec
21-
is loaded from <sys/_types/_timespec.h> for compatability */
21+
is loaded from <sys/_types/_timespec.h> for compatibility */
2222
// struct timespec { time_t tv_sec; long tv_nsec; };
2323

2424
int clock_gettime(clockid_t clk_id, struct timespec *tp);

patches/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This directory contains sizable user submitted patches that were rejected from mainline as they tend to be more subjective in nature.
44

5-
The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatability patch is provided and will automatically be applied.
5+
The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatibility patch is provided and will automatically be applied.
66

77
## List of patches
88

plugins/cdpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Description: 'cd' to the directory from CDPATH
44
#
5-
# Details: If the CDPATH environmet variable is not set, the default value of
5+
# Details: If the CDPATH environment variable is not set, the default value of
66
# ${XDG_CONFIG_HOME:-$HOME/.config}/nnn/bookmarks will be used.
77
# You can create this directory and fill it with symbolic links to your
88
# favorite directories. It's a good idea to add it to CDPATH so that it

plugins/preview-tui

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# - optional: glow or lowdown for markdown
3434
# - optional: w3m or lynx or elinks for html
3535
# - optional: set/export NNN_ICONLOOKUP as 1 to enable file icons in front of directory previews with .iconlookup
36-
# Icons and colors are configureable in .iconlookup
36+
# Icons and colors are configurable in .iconlookup
3737
# - optional: scope.sh file viewer from ranger.
3838
# 1. drop scope.sh executable in $PATH
3939
# 2. set/export $NNN_SCOPE as 1
@@ -78,7 +78,7 @@
7878
# Iterm2 users are recommended to use viu to view images without getting pixelated.
7979
#
8080
# Windows Terminal users can set "Profile termination behavior" under "Profile > Advanced" settings
81-
# to automaticaly close pane on quit when exit code is 0.
81+
# to automatically close pane on quit when exit code is 0.
8282
#
8383
# Shell: POSIX compliant
8484
# Authors: Todd Yamakawa, Léo Villeveygoux, @Recidiviste, Mario Ortiz Manero, Luuk van Baal, @WanderLanz

plugins/splitjoin

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [ "$resp" = "j" ]; then
2626
for entry in $arr
2727
do
2828
if [ -d "$entry" ]; then
29-
echo "cant join directories"
29+
echo "can't join directories"
3030
exit
3131
fi
3232
done

src/nnn.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4472,7 +4472,7 @@ static void set_smart_ctx(int ctx, char *nextpath, char **path, char *file, char
44724472
* 1) fdout == -1 && !page: Write up to CMD_LEN_MAX bytes of command output into g_buf
44734473
* 2) fdout == -1 && page: Create a temp file, write full command output into it and show in pager.
44744474
* 3) fdout != -1 && !page: Write full command output into the provided file.
4475-
* 4) fdout != -1 && page: Don't use! Returns FASLE.
4475+
* 4) fdout != -1 && page: Don't use! Returns FALSE.
44764476
*
44774477
* g_buf is modified only in case 1.
44784478
* g_tmpfpath is modified only in case 2.
@@ -6460,7 +6460,7 @@ static void statusbar(char *path)
64606460
}
64616461

64626462
attroff(COLOR_PAIR(cfg.curctx + 1));
6463-
/* Plase HW cursor on current for Braille systems */
6463+
/* Place HW cursor on current for Braille systems */
64646464
tocursor();
64656465
}
64666466

0 commit comments

Comments
 (0)