[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 67b6041 17/40: Merge pull request #934 from DamienCassou/t
From: |
Dmitry Gutov |
Subject: |
[elpa] master 67b6041 17/40: Merge pull request #934 from DamienCassou/typos |
Date: |
Thu, 2 Jan 2020 18:57:02 -0500 (EST) |
branch: master
commit 67b604130cefa84f989e0eacfa1a8aa523b6318a
Merge: d943198 ec1fb85
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
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)
- [elpa] master d497b8c 02/40: speed up company-etags, (continued)
- [elpa] master d497b8c 02/40: speed up company-etags, Dmitry Gutov, 2020/01/02
- [elpa] master 1cb2960 11/40: Use line-wrap in company doc buffer, Dmitry Gutov, 2020/01/02
- [elpa] master f6974e3 07/40: Merge pull request #909 from company-mode/revert-904-master, Dmitry Gutov, 2020/01/02
- [elpa] master ec1fb85 16/40: Fix typos, Dmitry Gutov, 2020/01/02
- [elpa] master 39a74c5 18/40: Add a NEWS entry, Dmitry Gutov, 2020/01/02
- [elpa] master c45c5f9 08/40: Extract company-capf--candidates for ease of debugging, Dmitry Gutov, 2020/01/02
- [elpa] master ccc22eb 05/40: Merge pull request #904 from redguardtoo/master, Dmitry Gutov, 2020/01/02
- [elpa] master 263438e 12/40: Merge pull request #930 from Zetagon/master, Dmitry Gutov, 2020/01/02
- [elpa] master 3cd2b1a 13/40: Update copyright, Dmitry Gutov, 2020/01/02
- [elpa] master d943198 15/40: Add some clarification for the require-match 'never return value, Dmitry Gutov, 2020/01/02
- [elpa] master 67b6041 17/40: Merge pull request #934 from DamienCassou/typos,
Dmitry Gutov <=
- [elpa] master 027d180 22/40: company--perform: Clarify the control flow a little bit, Dmitry Gutov, 2020/01/02
- [elpa] master 7287fa7 28/40: company-show-numbers-function: Improve the docstring, Dmitry Gutov, 2020/01/02
- [elpa] master 14f80ed 27/40: Move face definitions to a separate group, Dmitry Gutov, 2020/01/02
- [elpa] master 74b75eb 31/40: company-gtags--fetch-tags: Allow exit status 1, Dmitry Gutov, 2020/01/02
- [elpa] master 87c35d8 26/40: End group name with period, Dmitry Gutov, 2020/01/02
- [elpa] master a8d5d6f 24/40: company-files: Recognize file names right after [, Dmitry Gutov, 2020/01/02
- [elpa] master cf2d50b 25/40: Change the overlay's "underlying face" in a better way, Dmitry Gutov, 2020/01/02
- [elpa] master 335eb42 30/40: Fix case when "underlying face" is from Flymake or Flycheck, Dmitry Gutov, 2020/01/02
- [elpa] master d5f3a95 29/40: add option to show number on the left, Dmitry Gutov, 2020/01/02
- [elpa] master 856c66a 32/40: company-gtags--annotation: Use regexp-quote, Dmitry Gutov, 2020/01/02