Skip to content

Commit

Permalink
Fix easy-to-make typos
Browse files Browse the repository at this point in the history
  • Loading branch information
bwignall committed Nov 20, 2019
1 parent 9291fae commit c94dae0
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ This file uses Org mode. Some useful (default) key-bindings:

- Added support for full complexity of backtick syntax

- Operators at the end or beggining of line force expression continuation in indentation
- Operators at the end or beginning of line force expression continuation in indentation

- Map haskell-mode-format-imports to C-c C-, to avoid conflict with haskell-indent

Expand Down
6 changes: 3 additions & 3 deletions doc/haskell-mode.texi
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ completion candidates from completion-at-point function
(@code{company-capf} backend) and dynamic abbrevs.
@code{company-mode} provides special backend for dabbrev code
completions, namely @code{company-dabbrev-code}. To combine
completions from diffrent backends you can create grouped backends, it
completions from different backends you can create grouped backends, it
is very easy — a grouped backend is just a list of backends, for
example:

Expand Down Expand Up @@ -1246,7 +1246,7 @@ Separate sessions per Cabal project @file{haskell-session.el}.
@item
A new inferior Haskell process handling code @file{haskell-process.el}.
@item
New REPL implementation similiar to SLIME/IELM
New REPL implementation similar to SLIME/IELM
@item
Navigatable error overlays
@file{haskell-interactive-mode.el}.
Expand Down Expand Up @@ -2172,7 +2172,7 @@ The most common Cabal action is building, so that has a specific command:
M-x haskell-process-cabal-build
@end example

Or @kbd{C-c C-c}. When building, it will hide unneccessary output.
Or @kbd{C-c C-c}. When building, it will hide unnecessary output.

For example, to build the `ace` package, the output is simply:

Expand Down
2 changes: 1 addition & 1 deletion haskell-cabal.el
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ resulting buffer-content. Unmark line at the end."
(defun haskell-cabal-line-filename ()
"Expand filename in current line according to the subsection type
Module names in exposed-modules and other-modules are expanded by replacing each dot (.) in the module name with a foward slash (/) and appending \".hs\"
Module names in exposed-modules and other-modules are expanded by replacing each dot (.) in the module name with a forward slash (/) and appending \".hs\"
Example: Foo.Bar.Quux ==> Foo/Bar/Quux.hs
Expand Down
4 changes: 2 additions & 2 deletions haskell-completions.el
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ in this list.")
(defun haskell-completions-can-grab-prefix ()
"Check if the case is appropriate for grabbing completion prefix.
Returns t if point is either at whitespace character, or at
punctuation, or at line end and preceeding character is not a
punctuation, or at line end and preceding character is not a
whitespace or new line, otherwise returns nil.
Returns nil in presence of active region."
Expand Down Expand Up @@ -253,7 +253,7 @@ identifier at point depending on result of function
t)
;; but uppercase ident could occur after `as` keyword, or in
;; module imports after opening parenthesis, in this case
;; restore identifier type again, it's neccessary to
;; restore identifier type again, it's necessary to
;; distinguish the means of completions retrieval
(setq type 'haskell-completions-identifier-prefix))))))
(when (nth 8 (syntax-ppss))
Expand Down
2 changes: 1 addition & 1 deletion haskell-indentation.el
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ and indent when all of the following are true:
;; When the scope of this function ends, the variable is automatically
;; reverted to its old value.

;; This is basicly a performance hack. It would have been possible to
;; This is basically a performance hack. It would have been possible to
;; thread this state using a association-list through the parsers, but it
;; would be probably more complicated and slower due to the lack of real
;; closures in Emacs Lisp.
Expand Down
4 changes: 2 additions & 2 deletions haskell-interactive-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"Mark used for the old beginning of the prompt.")

(defun haskell-interactive-prompt-regex ()
"Generate a regex for searching for any occurence of the prompt\
"Generate a regex for searching for any occurrence of the prompt\
at the beginning of the line. This should prevent any
interference with prompts that look like haskell expressions."
(concat "^" (regexp-quote haskell-interactive-prompt)))
Expand Down Expand Up @@ -104,7 +104,7 @@ Key bindings:
(defvar haskell-interactive-mode-result-end
nil
"Mark used to figure out where the end of the current result output is.
Used to distinguish betwen user input.")
Used to distinguish between user input.")

(defvar-local haskell-interactive-previous-buffer nil
"Records the buffer to which `haskell-interactive-switch-back' should jump.
Expand Down
2 changes: 1 addition & 1 deletion haskell-process.el
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ Returns NIL when no completions found."
(let ((cnt1 (match-string 1 h0))
(h1 (haskell-string-literal-decode (match-string 3 h0))))
(unless (= (string-to-number cnt1) (length cs))
(error "Lengths inconsistent in `:complete' reponse"))
(error "Lengths inconsistent in `:complete' response"))
(cons h1 cs)))))))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Expand Down
2 changes: 1 addition & 1 deletion haskell-string.el
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ See also `haskell-string-take'."
str)

(defun haskell-string-split-to-lines (str)
"Split STR to lines and return a list of strings with preceeding and
"Split STR to lines and return a list of strings with preceding and
succeding space removed."
(when (stringp str)
(cl-mapcar #'haskell-string-chomp (split-string str "\n"))))
Expand Down
6 changes: 3 additions & 3 deletions haskell-utils.el
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ buffer, point was not moved, etc. To collect data `post-command-hook' is used."
"Clean up after async operation finished.
This function takes care about cleaning up things made by
`haskell-utils-async-watch-changes'. The BUFFER argument is a buffer where
`post-command-hook' should be disabled. This is neccessary, because
`post-command-hook' should be disabled. This is necessary, because
it is possible that user will change buffer during async function
execusion."
(with-current-buffer buffer
Expand Down Expand Up @@ -145,7 +145,7 @@ Returns one of the following symbols:
((string-match-p "^<interactive>:" first-line)
'interactive-error)
(t 'no-error)))
;; in case of nil-ish reponse it's not clear is it error response or not
;; in case of nil-ish response it's not clear is it error response or not
'no-error))

(defun haskell-utils-compose-type-at-command (pos)
Expand All @@ -167,7 +167,7 @@ expression bounds."
(setq end-l (line-number-at-pos))
(setq end-c (1+ (current-column)))
(setq value (buffer-substring-no-properties start-p end-p))
;; supress multiline expressions
;; suppress multiline expressions
(let ((lines (split-string value "\n" t)))
(when (and (cdr lines)
(stringp (car lines)))
Expand Down

0 comments on commit c94dae0

Please sign in to comment.