Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
tarsius committed Nov 5, 2019
1 parent 60e1e7d commit d587efc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ To do this, we use a wrapper structure with a type information tag.

Some objects expose data that belong to other objects. In many cases, libgit2 keeps reference-counts
on these internally, but that's not always true. In particular, `git_repository` structs are not
reference-counted (altough the data-owning sub-objects like `git_odb` are). Neither are lightweight
reference-counted (although the data-owning sub-objects like `git_odb` are). Neither are lightweight
public structs like `git_index_entry`, `git_diff_XYZ`, etc. In these cases, the *parent types* must
be reference-counted on our side, and the *child types* must keep a reference to the parent alive.

Expand Down
2 changes: 1 addition & 1 deletion src/egit-commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ emacs_value egit_commit_tree_id(emacs_env *env, emacs_value _commit)
// Operations

EGIT_DOC(commit_create, "REPO REFNAME AUTHOR COMMITTER MESSAGE TREE &optional PARENTS",
"Create a new committ in REPO and return its ID.\n"
"Create a new commit in REPO and return its ID.\n"
"REFNAME, if non-nil, must be the name of a reference that will\n"
"be updated to point to the new commit. It will be created if it\n"
"does not exist. Use \"HEAD\" to update the HEAD of the current branch.\n"
Expand Down
2 changes: 1 addition & 1 deletion src/egit-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ EGIT_DOC(diff_find_similar, "DIFF &optional OPTIONS",
" This is equivalent to the -C option (see git-diff(1)).\n"
" Defaults to 50.\n"
"\n"
" - `break-rewrite-threshold' is an integer treshold below which\n"
" - `break-rewrite-threshold' is an integer threshold below which\n"
" similar files will be split into a delete/add pair.\n"
" This is equivalent to the last part of the -B option (see git-diff(1))\n"
" Defaults to 60.\n"
Expand Down
8 changes: 4 additions & 4 deletions src/interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@
#define EM_EXTRACT_BOOLEAN(val) (env->is_not_nil(env, (val)) ? 1 : 0)

// Extract a string from an emacs_value.
// Caller is reponsible for ensuring that the emacs_value represents a string.
// Caller is responsible for ensuring that the emacs_value represents a string.
#define EM_EXTRACT_STRING(val) em_get_string(env, (val));

// Extract an integer from an emacs_value.
// Caller is reponsible for ensuring that the emacs_value represents an integer.
// Caller is responsible for ensuring that the emacs_value represents an integer.
#define EM_EXTRACT_INTEGER(val) env->extract_integer(env, (val))

// Extract an integer from an emacs_value with a default.
// Caller is reponsible for ensuring that the emacs_value represents an integer or nil.
// Caller is responsible for ensuring that the emacs_value represents an integer or nil.
#define EM_EXTRACT_INTEGER_OR_DEFAULT(val, default) \
(EM_EXTRACT_BOOLEAN(val) ? EM_EXTRACT_INTEGER(val) : (default))

// Extract a string from an emacs_value, or NULL.
// Caller is reponsible for ensuring that the emacs_value represents a string or nil.
// Caller is responsible for ensuring that the emacs_value represents a string or nil.
#define EM_EXTRACT_STRING_OR_NULL(val) \
(EM_EXTRACT_BOOLEAN(val) ? em_get_string(env, (val)) : NULL)

Expand Down

0 comments on commit d587efc

Please sign in to comment.