aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-01-25 18:24:09 -0500
committerGlenn Morris2016-01-25 18:24:09 -0500
commit9dec01d2912f84373c16fa8cc9da8992f37e6de6 (patch)
treec7f8ce46074d216ea690e23c540b6c4b714d8090
parent60f6bd85a61ab0e46a51ed6adc7e13f05d43338a (diff)
downloademacs-9dec01d2912f84373c16fa8cc9da8992f37e6de6.tar.gz
emacs-9dec01d2912f84373c16fa8cc9da8992f37e6de6.zip
; Spelling fixes (American spelling)
-rw-r--r--lisp/ChangeLog.174
-rw-r--r--lisp/simple.el2
-rw-r--r--src/xwidget.c2
-rw-r--r--test/ChangeLog.14
-rw-r--r--test/etags/el-src/emacs/lisp/progmodes/etags.el2
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 @@
4437 4437
44382014-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org> 44382014-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
4439 4439
4440 * net/eww.el (eww-follow-link): Revert prefix behaviour to 4440 * net/eww.el (eww-follow-link): Revert prefix behavior to
4441 previous behavior. 4441 previous behavior.
4442 (eww-copy-page-url): Add doc string. 4442 (eww-copy-page-url): Add doc string.
4443 4443
@@ -9140,7 +9140,7 @@
91402014-06-30 Grégoire Jadi <daimrod@gmail.com> 91402014-06-30 Grégoire Jadi <daimrod@gmail.com>
9141 9141
9142 * net/rcirc.el (rcirc-buffer-process): Restore previous 9142 * net/rcirc.el (rcirc-buffer-process): Restore previous
9143 behaviour. (Bug#17772) 9143 behavior. (Bug#17772)
9144 9144
91452014-06-29 Alan Mackenzie <acm@muc.de> 91452014-06-29 Alan Mackenzie <acm@muc.de>
9146 9146
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
2894have been made. By default `self-insert-command' and 2894have been made. By default `self-insert-command' and
2895`delete-char' are the only amalgamating commands, although this 2895`delete-char' are the only amalgamating commands, although this
2896function could be called by any command wishing to have this 2896function could be called by any command wishing to have this
2897behaviour." 2897behavior."
2898 (let ((last-amalgamating-count 2898 (let ((last-amalgamating-count
2899 (undo-auto--last-boundary-amalgamating-number))) 2899 (undo-auto--last-boundary-amalgamating-number)))
2900 (setq undo-auto--this-command-amalgamating t) 2900 (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,
530 container later. Drawing should crop container window if necessary 530 container later. Drawing should crop container window if necessary
531 to handle case where xwidget is partially obscured by other Emacs 531 to handle case where xwidget is partially obscured by other Emacs
532 windows. Other containers than gtk_fixed where explored, but 532 windows. Other containers than gtk_fixed where explored, but
533 gtk_fixed had the most predictable behaviour so far. */ 533 gtk_fixed had the most predictable behavior so far. */
534 534
535 xv->emacswindow = FRAME_GTK_WIDGET (s->f); 535 xv->emacswindow = FRAME_GTK_WIDGET (s->f);
536 xv->widgetwindow = gtk_fixed_new (); 536 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 @@
343 343
344 * automated/tildify-tests.el (tildify-space-undo-test--test): 344 * automated/tildify-tests.el (tildify-space-undo-test--test):
345 A new helper function for testing `tildify-double-space-undos' 345 A new helper function for testing `tildify-double-space-undos'
346 behaviour in the `tildify-space' function. 346 behavior in the `tildify-space' function.
347 (tildify-space-undo-test-html, tildify-space-undo-test-html-nbsp) 347 (tildify-space-undo-test-html, tildify-space-undo-test-html-nbsp)
348 (tildify-space-undo-test-xml, tildify-space-undo-test-tex): 348 (tildify-space-undo-test-xml, tildify-space-undo-test-tex):
349 New tests for `tildify-doule-space-undos' behaviour. 349 New tests for `tildify-doule-space-undos' behavior.
350 350
351 * automated/tildify-tests.el (tildify-space-test--test): 351 * automated/tildify-tests.el (tildify-space-test--test):
352 A new helper function for testing `tildify-space' function. 352 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)."
2094 (`apropos (etags--xref-find-definitions id t)))) 2094 (`apropos (etags--xref-find-definitions id t))))
2095 2095
2096(defun etags--xref-find-definitions (pattern &optional regexp?) 2096(defun etags--xref-find-definitions (pattern &optional regexp?)
2097 ;; This emulates the behaviour of `find-tag-in-order' but instead of 2097 ;; This emulates the behavior of `find-tag-in-order' but instead of
2098 ;; returning one match at a time all matches are returned as list. 2098 ;; returning one match at a time all matches are returned as list.
2099 ;; NOTE: find-tag-tag-order is typically a buffer-local variable. 2099 ;; NOTE: find-tag-tag-order is typically a buffer-local variable.
2100 (let* ((xrefs '()) 2100 (let* ((xrefs '())