[Emacs-diffs] emacs-26 f2b2201: ; Spelling and URL fixes

[Paul Eggert]

branch: emacs-26
commit f2b2201594b59ff758347644a84cdc8f6b046ec9
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ; Spelling and URL fixes
---
 ChangeLog.2                                               | 4 ++--
 ChangeLog.3                                               | 8 ++++----
 etc/NEWS                                                  | 2 +-
 lisp/calendar/cal-tex.el                                  | 2 +-
 lisp/emacs-lisp/ert-x.el                                  | 2 +-
 lisp/org/ChangeLog.1                                      | 4 ++--
 test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el | 2 +-
 test/lisp/emacs-lisp/edebug-tests.el                      | 6 +++---
 test/lisp/vc/smerge-mode-tests.el                         | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index bd1800b..e789722 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -4808,7 +4808,7 @@
        Link from (emacs)Exiting to (lisp)Killing Emacs
 
        * doc/emacs/entering.texi (Exiting): Link to the lispref
-       manual for further customisations (bug#15445).
+       manual for further customizations (bug#15445).
 
        (cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28)
 
@@ -7845,7 +7845,7 @@
 
 2016-02-20  Lars Ingebrigtsen  <address@hidden>
 
-       Allow customising the article mode cursor behavior
+       Allow customizing the article mode cursor behavior
 
        * doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor.
 
diff --git a/ChangeLog.3 b/ChangeLog.3
index 9f43511..9e622ce 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -12949,7 +12949,7 @@
        Link from (emacs)Exiting to (lisp)Killing Emacs
 
        * doc/emacs/entering.texi (Exiting): Link to the lispref
-       manual for further customisations (bug#15445).
+       manual for further customizations (bug#15445).
 
 2016-04-29  Lars Ingebrigtsen  <address@hidden>
 
@@ -13159,7 +13159,7 @@
        Move the diff command to "Operate" in ibuffer
 
        * lisp/ibuffer.el (ibuffer-mode-operate-map): Move the diff
-       command to the "Operate" menu, and remove the customisation
+       command to the "Operate" menu, and remove the customization
        entry to make the "View" menu more logical (bug#1150).
 
 2016-04-27  Lars Ingebrigtsen  <address@hidden>
@@ -16589,7 +16589,7 @@
        really changed.
        (save_window_save): Set the pixel_height_before_size_change and
        pixel_width_before_size_change fields.
-       (Vwindow_size_change_functions): Move here definiton from xdisp.c.
+       (Vwindow_size_change_functions): Move here definition from xdisp.c.
        * src/xdisp.c (prepare_menu_bars, redisplay_internal): Call
        run_window_size_change_functions.
        (Vwindow_size_change_functions): Move definition to window.c.
@@ -16842,7 +16842,7 @@
        5d17ae7 Improve file-notify-test08-watched-file-in-watched-dir
        1cb1268 Fix todo-mode item date editing bugs
        1e996cf Fix "[:upper:]" for non-ASCII characters
-       896f993 Allow customising the article mode cursor behavior
+       896f993 Allow customizing the article mode cursor behavior
        24c1c1d Use pop-to-buffer-same-window in woman.el
        2a75f64 New filenotify test for bug#22736
        c9bccf7 Report critical battery errors
diff --git a/etc/NEWS b/etc/NEWS
index 280ab64..34561ac 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1893,7 +1893,7 @@ of frame decorations on macOS 10.9+.
 ** Mousewheel and trackpad scrolling on macOS 10.7+ now behaves more
 like the macOS default.  The new variables
 'ns-use-system-mwheel-acceleration', 'ns-touchpad-scroll-line-height'
-and 'ns-touchpad-use-momentum' can be used to customise the behavior.
+and 'ns-touchpad-use-momentum' can be used to customize the behavior.
 
 
 ----------------------------------------------------------------------
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 72db03e..1d29560 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -266,7 +266,7 @@ specified in ARGS.  When ARGS is omitted, by default the 
option
 \"12pt,a4paper\" is passed. When ARGS has any other value, then
 no option is passed to the class.
 
-Insert the \"\\usepacakge{geometry}\" directive when ARGS
+Insert the \"\\usepackage{geometry}\" directive when ARGS
 contains the \"landscape\" string."
   (set-buffer (generate-new-buffer cal-tex-buffer))
   (save-match-data
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 5af5262..71d46c1 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -328,7 +328,7 @@ to the real `message'."
         (funcall func "%s" msg)))))
 
 (defun ert--make-print-advice (collector)
-  "Create around advice for print functions for `ert-collect-messsges'.
+  "Create around advice for print functions for `ert-collect-messages'.
 The created advice function will just call the original function
 unless the output is going to the echo area (when PRINTCHARFUN is
 t or PRINTCHARFUN is nil and `standard-output' is t).  If the
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 366a3ee..ee50f6f 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -5015,10 +5015,10 @@
        * ox-latex.el (org-latex-listings): Update docstring.
 
        * org-pcomplete.el (pcomplete/org-mode/file-option/options):
-       Apply changes to export back-end definiton.
+       Apply changes to export back-end definition.
 
        * org.el (org-get-export-keywords): Apply changes to export
-       back-end definiton.
+       back-end definition.
 
        * ox-html.el (org-html--format-toc-headline): Make use of
        anonymous back-ends.
diff --git a/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el 
b/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
index 0cc7b1e..f52a2b1 100644
--- a/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
+++ b/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
@@ -17,7 +17,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/lisp/emacs-lisp/edebug-tests.el 
b/test/lisp/emacs-lisp/edebug-tests.el
index 037278e..02f4d1c 100644
--- a/test/lisp/emacs-lisp/edebug-tests.el
+++ b/test/lisp/emacs-lisp/edebug-tests.el
@@ -17,7 +17,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -310,7 +310,7 @@ Then clear edebug-tests' saved messages."
   (setq edebug-tests-messages ""))
 
 (defun edebug-tests-locate-def (def-name)
-  "Search for a definiton of DEF-NAME from the start of the current buffer.
+  "Search for a definition of DEF-NAME from the start of the current buffer.
 Place point at the end of DEF-NAME in the buffer."
   (goto-char (point-min))
   (re-search-forward (concat "def\\S-+ edebug-test-code-" def-name)))
@@ -584,7 +584,7 @@ test and possibly others should be updated."
 
 (ert-deftest edebug-tests-error-trying-to-set-breakpoint-in-uninstrumented-code
     ()
-  "Edebug refuses to set a breakpoint in uninsented code."
+  "Edebug refuses to set a breakpoint in uninstrumented code."
   (edebug-tests-with-normal-env
    (edebug-tests-setup-@ "fac" '(5) t)
    (let* ((debug-on-error nil)
diff --git a/test/lisp/vc/smerge-mode-tests.el 
b/test/lisp/vc/smerge-mode-tests.el
index 204a4b9..10d0906 100644
--- a/test/lisp/vc/smerge-mode-tests.el
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Code: