diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-01-25 18:24:09 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-01-25 18:24:09 -0500 |
| commit | 9dec01d2912f84373c16fa8cc9da8992f37e6de6 (patch) | |
| tree | c7f8ce46074d216ea690e23c540b6c4b714d8090 | |
| parent | 60f6bd85a61ab0e46a51ed6adc7e13f05d43338a (diff) | |
| download | emacs-9dec01d2912f84373c16fa8cc9da8992f37e6de6.tar.gz | |
; Spelling fixes (American spelling)
| -rw-r--r-- | lisp/ChangeLog.17 | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 2 | ||||
| -rw-r--r-- | src/xwidget.c | 2 | ||||
| -rw-r--r-- | test/ChangeLog.1 | 4 | ||||
| -rw-r--r-- | test/etags/el-src/emacs/lisp/progmodes/etags.el | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index ee812bde82d..1785a336732 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -4437,7 +4437,7 @@ 2014-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org> - * net/eww.el (eww-follow-link): Revert prefix behaviour to + * net/eww.el (eww-follow-link): Revert prefix behavior to previous behavior. (eww-copy-page-url): Add doc string. @@ -9140,7 +9140,7 @@ 2014-06-30 Grégoire Jadi <daimrod@gmail.com> * net/rcirc.el (rcirc-buffer-process): Restore previous - behaviour. (Bug#17772) + behavior. (Bug#17772) 2014-06-29 Alan Mackenzie <acm@muc.de> diff --git a/lisp/simple.el b/lisp/simple.el index ed4ca91b2e5..72e87a410fc 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2894,7 +2894,7 @@ removes the previous `undo-boundary' if a series of such calls have been made. By default `self-insert-command' and `delete-char' are the only amalgamating commands, although this function could be called by any command wishing to have this -behaviour." +behavior." (let ((last-amalgamating-count (undo-auto--last-boundary-amalgamating-number))) (setq undo-auto--this-command-amalgamating t) diff --git a/src/xwidget.c b/src/xwidget.c index 9450bdf7870..8745416f3db 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -530,7 +530,7 @@ xwidget_init_view (struct xwidget *xww, container later. Drawing should crop container window if necessary to handle case where xwidget is partially obscured by other Emacs windows. Other containers than gtk_fixed where explored, but - gtk_fixed had the most predictable behaviour so far. */ + gtk_fixed had the most predictable behavior so far. */ xv->emacswindow = FRAME_GTK_WIDGET (s->f); xv->widgetwindow = gtk_fixed_new (); diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index 01cb97e0da3..3520f13df60 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -343,10 +343,10 @@ * automated/tildify-tests.el (tildify-space-undo-test--test): A new helper function for testing `tildify-double-space-undos' - behaviour in the `tildify-space' function. + behavior in the `tildify-space' function. (tildify-space-undo-test-html, tildify-space-undo-test-html-nbsp) (tildify-space-undo-test-xml, tildify-space-undo-test-tex): - New tests for `tildify-doule-space-undos' behaviour. + New tests for `tildify-doule-space-undos' behavior. * automated/tildify-tests.el (tildify-space-test--test): A new helper function for testing `tildify-space' function. diff --git a/test/etags/el-src/emacs/lisp/progmodes/etags.el b/test/etags/el-src/emacs/lisp/progmodes/etags.el index 6c28ba35a4c..5d28657e28b 100644 --- a/test/etags/el-src/emacs/lisp/progmodes/etags.el +++ b/test/etags/el-src/emacs/lisp/progmodes/etags.el @@ -2094,7 +2094,7 @@ for \\[find-tag] (which see)." (`apropos (etags--xref-find-definitions id t)))) (defun etags--xref-find-definitions (pattern &optional regexp?) - ;; This emulates the behaviour of `find-tag-in-order' but instead of + ;; This emulates the behavior of `find-tag-in-order' but instead of ;; returning one match at a time all matches are returned as list. ;; NOTE: find-tag-tag-order is typically a buffer-local variable. (let* ((xrefs '()) |