branch: master
commit 67b604130cefa84f989e0eacfa1a8aa523b6318a
Merge: d943198 ec1fb85
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: GitHub <nore...@github.com>
Merge pull request #934 from DamienCassou/typos
Fix typos
---
NEWS.md | 2 +-
company-capf.el | 2 +-
company.el | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index aad2ec3..8b83f54 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -303,7 +303,7 @@
## 2013-09-28 (0.6.12)
* Default value of `company-begin-commands` changed to `(self-insert-command)`.
-* Futher improvement in `org-indent-mode` compatibility.
+* Further improvement in `org-indent-mode` compatibility.
## 2013-08-18 (0.6.11)
diff --git a/company-capf.el b/company-capf.el
index bc654c6..5b7a1f3 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -196,7 +196,7 @@ so we can't just use the preceding variable instead.")
;; FIXME: Should probably use an additional heuristic:
;; completion-at-point doesn't know when the user picked a
;; particular candidate explicitly (it only checks whether
- ;; futher completions exist). Whereas company user can press
+ ;; further completions exist). Whereas company user can press
;; RET (or use implicit completion with company-tng).
(if (eq (try-completion arg table pred) t)
'finished 'sole)))))
diff --git a/company.el b/company.el
index f0d0f8a..6feb6fc 100644
--- a/company.el
+++ b/company.el
@@ -554,7 +554,7 @@ This can also be a function."
(defcustom company-auto-complete-chars '(?\ ?\) ?.)
"Determines which characters trigger auto-completion.
See `company-auto-complete'. If this is a string, each string character
-tiggers auto-completion. If it is a list of syntax description characters (see
+triggers auto-completion. If it is a list of syntax description characters
(see
`modify-syntax-entry'), all characters with that syntax auto-complete.
This can also be a function, which is called with the new input and should
@@ -3039,7 +3039,7 @@ Delay is determined by `company-tooltip-idle-delay'."
pto
(char-before pos)
(eq pos (overlay-start pto)))))
- ;; Try to accomodate for the pseudo-tooltip overlay,
+ ;; Try to accommodate for the pseudo-tooltip overlay,
;; which may start at the same position if it's at eol.
(when ptf-workaround
(cl-decf beg)
