emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 f2caf08: ; Spelling fixes


From: Paul Eggert
Subject: [Emacs-diffs] emacs-26 f2caf08: ; Spelling fixes
Date: Sun, 4 Mar 2018 20:10:41 -0500 (EST)

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

    ; Spelling fixes
---
 ChangeLog.2             |  2 +-
 ChangeLog.3             | 18 +++++++++---------
 doc/misc/cc-mode.texi   |  2 +-
 doc/misc/org.texi       |  2 +-
 doc/misc/tramp.texi     |  2 +-
 etc/ORG-NEWS            | 12 ++++++------
 lisp/filenotify.el      |  2 +-
 lisp/frame.el           |  2 +-
 lisp/org/org-element.el |  2 +-
 lisp/org/org.el         |  4 ++--
 lisp/term.el            |  4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index eab9e3d..b01ab19 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -9949,7 +9949,7 @@
        * lisp/files-x.el (modify-dir-local-variable): Small rewrite
 
        Change a variable name to be more meaningful, and reorder some of
-       the code with no change in behaviour.
+       the code with no change in behavior.
 
 2016-01-26  Artur Malabarba  <address@hidden>
 
diff --git a/ChangeLog.3 b/ChangeLog.3
index 5b68559..ea4d71c 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -4805,7 +4805,7 @@
 
 2017-10-11  Alan Third  <address@hidden>
 
-       Make frame-list-z-order on NS match Windows behaviour (bug#28788)
+       Make frame-list-z-order on NS match Windows behavior (bug#28788)
 
        * src/nsfns.m (Fns_frame_list_z_order): If terminal isn't a frame,
        ignore it rather than returning nil.
@@ -5932,7 +5932,7 @@
 
        Flymake uses some new fringe bitmaps
 
-       Also fix behaviour whereby flymake wouldn't react to a change in the
+       Also fix behavior whereby flymake wouldn't react to a change in the
        variable.
 
        * lisp/progmodes/flymake-ui.el (flymake-error-bitmap)
@@ -6180,7 +6180,7 @@
        REPORT-FN's calling convention stipulates that a backend calls it with
        a list of diagnostics as argument, or, alternatively, with a symbol
        denoting an exceptional situation, usually some panic resulting from a
-       misconfigured backend.  In keeping with legacy behaviour,
+       misconfigured backend.  In keeping with legacy behavior,
        flymake.el's response to a panic is to disable the issuing backend.
 
        The flymake--diag object representing a diagnostic now also keeps
@@ -7918,7 +7918,7 @@
 
 2017-09-15  Michael Albinus  <address@hidden>
 
-       Improve Tramp behaviour according to bug#27986
+       Improve Tramp behavior according to bug#27986
 
        * lisp/net/tramp-adb.el (tramp-adb-handle-copy-file):
        * lisp/net/tramp-sh.el (tramp-sh-handle-copy-directory):
@@ -8120,7 +8120,7 @@
 
        Add clarification to if-let* docstring
 
-       Also make its behaviour consistent with and-let* in that empty bindings
+       Also make its behavior consistent with and-let* in that empty bindings
        results in success, not failure.
        * lisp/emacs-lisp/subr-x.el: Edit docstring, change else to then.
 
@@ -22797,7 +22797,7 @@
        (Type Descriptors): new section.
        * doc/lispref/elisp.texi: reference it.
        * doc/lispref/records.texi (Records): reference it.  Document
-       behaviour when type slot is a record.
+       behavior when type slot is a record.
 
        * admin/alloc-colors.c (Fmake_record, Frecord): mention type desciptors.
 
@@ -23348,7 +23348,7 @@
 
        Now dired-mark-extension prepends '.' to extension when not present.
        Add command dired-mark-suffix to preserve the previous
-       behaviour (Bug#25942).
+       behavior (Bug#25942).
        * lisp/dired-x.el (dired-mark-suffix): New command;
        mark files ending in a given suffix.
        (dired--mark-suffix-interactive-spec): New defun.
@@ -45072,7 +45072,7 @@
        Sync from gnulib
 
        This incorporates a spelling fix, plus:
-       2016-05-09 Fix undefined behaviour in gettext.h
+       2016-05-09 Fix undefined behavior in gettext.h
        * lib/gettext.h, lib/mktime.c:
        Copy from gnulib.
 
@@ -54900,7 +54900,7 @@
        make check unconditional, check-maybe top-level.
 
         * Makefile.in: Add check-maybe target.
-        * test/Makefile.in: Restore unconditional behaviour to make check.
+        * test/Makefile.in: Restore unconditional behavior to make check.
 
 2015-12-01  Phillip Lord  <address@hidden>
 
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index d0d39d4..5a229c1 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -4734,7 +4734,7 @@ Once again, line 8 is assigned as @code{brace-entry-open} 
as is line
 with anchor point at the @address@hidden of line address@hidden extra
 syntactic element was introduced in @ccmode{} 5.33.1 to allow extra
 flexibility in indenting the second line of such a construct.  You can
-preserve the behaviour resulting from the former syntactic analysis by
+preserve the behavior resulting from the former syntactic analysis by
 giving @code{brace-list-entry} an offset of
 @code{c-lineup-under-anchor} (@pxref{Misc Line-Up}).}, and
 @code{brace-list-entry} anchored on the @samp{1} of line 8.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index cd61259..c6d603c 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -10237,7 +10237,7 @@ for display purposes only.
 @cindex dash, special symbol
 @cindex ellipsis, special symbol
 In addition to regular entities defined above, Org exports in a special
address@hidden behaviour can be disabled with @code{-} export setting
address@hidden behavior can be disabled with @code{-} export setting
 (@pxref{Export settings}).} the following commonly used character
 combinations: @samp{\-} is treated as a shy hyphen, @samp{--} and @samp{---}
 are converted into dashes, and @samp{...} becomes a compact set of dots.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index aa8e84c..f4a1951 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3323,7 +3323,7 @@ Why is @file{~/.sh_history} file on the remote host 
growing?
 @vindex tramp-histfile-override
 Due to the remote shell saving tilde expansions triggered by
 @value{tramp}, the history file is probably growing rapidly.
address@hidden can suppress this behaviour with the user option
address@hidden can suppress this behavior with the user option
 @option{tramp-histfile-override}.  When set to @code{t}, environment
 variable @env{HISTFILE} is unset, and environment variables
 @env{HISTFILESIZE} @env{HISTSIZE} are set to 0.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 12eab44..b9f3b0c 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1358,7 +1358,7 @@ don't have to be distinct on a heading.
 
 Grouptags had to previously be defined with { }.  This syntax is
 already used for exclusive tags and Grouptags need their own,
-non-exclusive syntax.  This behaviour is achieved with [ ].  Note: { }
+non-exclusive syntax.  This behavior is achieved with [ ].  Note: { }
 can still be used also for Grouptags but then only one of the given
 tags can be used on the headline at the same time.  Example:
 
@@ -1422,9 +1422,9 @@ Check the documentation for more details.
 
 Thanks to Jarmo Hurri for this feature.
 
-*** New behaviour for ~org-toggle-latex-fragment~
+*** New behavior for ~org-toggle-latex-fragment~
 
-The new behaviour is the following:
+The new behavior is the following:
 
 - With a double prefix argument or with a single prefix argument when
   point is before the first headline, toggle overlays in the whole
@@ -1623,10 +1623,10 @@ leading spaces within table cells.
 Org uses the MathJax CDN by default.  See the manual and the docstring
 of ~org-html-mathjax-options~ for details.
 
-*** New behaviour in `org-export-options-alist'
+*** New behavior in `org-export-options-alist'
 
 When defining a back-end, it is now possible to specify to give
-`parse' behaviour on a keyword.  It is equivalent to call
+`parse' behavior on a keyword.  It is equivalent to call
 `org-element-parse-secondary-string' on the value.
 
 However, parsed =KEYWORD= is automatically associated to an
@@ -1745,7 +1745,7 @@ everywhere in the buffer, possibly corrupting URLs.
 *** Removed option =org-babel-sh-command=
 
 This undocumented option defaulted to the value of =shell-file-name= at
-the time of loading =ob-shell=.  The new behaviour is to use the value
+the time of loading =ob-shell=.  The new behavior is to use the value
 of =shell-file-name= directly when the shell langage is =shell=.  To chose
 a different shell, either customize =shell-file-name= or bind this
 variable locally.
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 986dc09..21c9cc2 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -419,7 +419,7 @@ DESCRIPTOR should be an object returned by 
`file-notify-add-watch'."
 
 ;; TODO:
 ;; * Watching a /dir/file may receive events for dir.
-;;   (This may be the desired behaviour.)
+;;   (This may be the desired behavior.)
 ;; * Watching a file in an already watched directory
 ;;   If the file is created and *then* a watch is added to that file, the
 ;;   watch might receive events which occurred prior to it being created,
diff --git a/lisp/frame.el b/lisp/frame.el
index a28baf7..447413b 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2441,7 +2441,7 @@ See also `toggle-frame-maximized'."
        nil `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen))))
     ;; Manipulating a frame without waiting for the fullscreen
     ;; animation to complete can cause a crash, or other unexpected
-    ;; behaviour, on macOS (bug#28496).
+    ;; behavior, on macOS (bug#28496).
     (when (featurep 'cocoa) (sleep-for 0.5))))
 
 ;;;; Key bindings
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 7a40d69..9e5c400 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -4721,7 +4721,7 @@ indentation removed from its contents."
 ;; Cache is enabled by default, but can be disabled globally with
 ;; `org-element-use-cache'.  `org-element-cache-sync-idle-time',
 ;; org-element-cache-sync-duration' and `org-element-cache-sync-break'
-;; can be tweaked to control caching behaviour.
+;; can be tweaked to control caching behavior.
 ;;
 ;; Internally, parsed elements are stored in an AVL tree,
 ;; `org-element--cache'.  This tree is updated lazily: whenever
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 4e46205..a53553b 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -10641,7 +10641,7 @@ a timestamp or a link."
                   (save-excursion
                     ;; Do not validate action when point is on the
                     ;; spaces right after the footnote label, in
-                    ;; order to be on par with behaviour on links.
+                    ;; order to be on par with behavior on links.
                     (skip-chars-forward " \t")
                     (let ((begin
                            (org-element-property :contents-begin context)))
@@ -10794,7 +10794,7 @@ there is one, return it."
        (cons link end)))))
 
 ;; TODO: These functions are deprecated since `org-open-at-point'
-;; hard-codes behaviour for "file+emacs" and "file+sys" types.
+;; hard-codes behavior for "file+emacs" and "file+sys" types.
 (defun org-open-file-with-system (path)
   "Open file at PATH using the system way of opening it."
   (org-open-file path 'system))
diff --git a/lisp/term.el b/lisp/term.el
index 3970e93..a470873 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -498,7 +498,7 @@ inconsistent with the state of the terminal understood by 
the
 inferior process.  Only the process filter is allowed to make
 changes to the buffer.
 
-Customize this option to nil if you want the previous behaviour."
+Customize this option to nil if you want the previous behavior."
   :version "26.1"
   :type 'boolean
   :group 'term)
@@ -519,7 +519,7 @@ commands can be invoked on the mouse-selected point or 
region,
 until the process filter (or user) moves point to the process
 mark once again.
 
-Customize this option to nil if you want the previous behaviour."
+Customize this option to nil if you want the previous behavior."
   :version "26.1"
   :type 'boolean
   :group 'term)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]