diff options
| -rw-r--r-- | ChangeLog.3 | 6 | ||||
| -rw-r--r-- | doc/misc/flymake.texi | 4 | ||||
| -rw-r--r-- | lib-src/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/analyze/refs.el | 2 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index 811b6dbad76..2d7f3bbf3a2 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -926,7 +926,7 @@ constrained to call REPORT-FN exactly once. It may do so any number of times, cumulatively reporting diagnostics. Flymake keeps track of outdated REPORT-FN instances and disconsiders obsolete reports. - Backends should avoid reporting obsolete data by cancelling any + Backends should avoid reporting obsolete data by canceling any ongoing processing at every renewed call to the backend function. Consolidated flymake.el internal data structures to require less @@ -18314,7 +18314,7 @@ Throw a `search-failed' derived error in Info search - The original fix for Bug#6106 switched from signalling `search-failed' + The original fix for Bug#6106 switched from signaling `search-failed' to `user-error'. However, this breaks incremental searching over multiple nodes because the isearch code doesn't expect a `user-error'. @@ -28599,7 +28599,7 @@ http://trac.common-lisp.net/bordeaux-threads/wiki/ApiDocumentation ... but not identically. In particular I chose not to implement - interrupt-thread or destroy-thread, but instead a thread-signalling + interrupt-thread or destroy-thread, but instead a thread-signaling approach. I'm still undecided about *default-special-bindings* (which I did not diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 05d879d8f4b..99ab1271ac9 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -560,7 +560,7 @@ Binding,,, elisp, The Emacs Lisp Reference Manual}) to be active. (defun ruby-flymake (report-fn &rest _args) ;; Not having a ruby interpreter is a serious problem which should cause - ;; the backend to disable itself, so an @code{error} is signalled. + ;; the backend to disable itself, so an @code{error} is signaled. ;; (unless (executable-find "ruby") (error "Cannot find a suitable ruby")) @@ -625,7 +625,7 @@ Binding,,, elisp, The Emacs Lisp Reference Manual}) to be active. msg) into diags finally (funcall report-fn diags))) - (flymake-log :warning "Cancelling obsolete check %s" + (flymake-log :warning "Canceling obsolete check %s" proc)) ;; Cleanup the temporary buffer used to hold the ;; check's output. diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index 4b5422e712c..5a370035d70 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 @@ -5643,7 +5643,7 @@ 1998-04-06 Andreas Schwab <schwab@gnu.org> Silence -Wimplicit: - * movemail.c: Move cancelations up. Include <stdlib.h> if + * movemail.c: Move cancellations up. Include <stdlib.h> if available. * fakemail.c (_XOPEN_SOURCE): Define for declaration of cuserid. (parse_header): Explicitly declare return type. diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el index a58479f5054..6ebf130d305 100644 --- a/lisp/cedet/semantic/analyze/refs.el +++ b/lisp/cedet/semantic/analyze/refs.el @@ -348,7 +348,7 @@ Only works for tags in the global namespace." (push-mark) (semantic-go-to-tag target) - (pop-to-buffer-same-windown (current-buffer)) + (pop-to-buffer-same-window (current-buffer)) (semantic-momentary-highlight-tag target)) ) diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 30776b46d7e..27072e25a6c 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -45,7 +45,7 @@ # ifneq (,$(GL_GENERATE_xxxx_H)) # Depending on whether DJGPP uses the corresponding header, these # should be edited either to 1 (thus exposing the recipe) or -# to notyhing, which makes Make bypass the recipe away. Example: +# to nothing, which makes Make bypass the recipe away. Example: # # s/^@GL_GENERATE_STDBOOL_H@/1/ # s/^@GL_GENERATE_STDINT_H@// |