[Emacs-diffs] /srv/bzr/emacs/trunk r109202: Prefer typical American spelling for "acknowledgment".

[Paul Eggert]

------------------------------------------------------------
revno: 109202
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-24 22:48:19 -0700
message:
  Prefer typical American spelling for "acknowledgment".
modified:
  admin/notes/bugtracker
  doc/lispref/ChangeLog
  doc/lispref/elisp.texi
  doc/lispref/intro.texi
  doc/lispref/spellfile
  doc/man/emacs.1
  doc/misc/ChangeLog
  doc/misc/calc.texi
  doc/misc/idlwave.texi
  doc/misc/sc.texi
  doc/misc/ses.texi
  doc/misc/woman.texi
  leim/SKK-DIC/SKK-JISYO.L
  leim/ja-dic/ja-dic.el
  lisp/ChangeLog
  lisp/completion.el
  lisp/emulation/cua-rect.el
  lisp/emulation/viper.el
  lisp/hippie-exp.el
  lisp/ido.el
  lisp/iswitchb.el
  lisp/mail/emacsbug.el
  lisp/mail/mspools.el
  lisp/mail/rfc2368.el
  lisp/progmodes/cmacexp.el
  lisp/progmodes/ebnf-yac.el
  lisp/progmodes/ebnf2ps.el
  lisp/progmodes/vhdl-mode.el
  lisp/vc/add-log.el
  lisp/vc/ediff.el
  lisp/vc/vc-git.el
  lisp/whitespace.el
  lisp/windmove.el
  lisp/woman.el

=== modified file 'admin/notes/bugtracker'
--- a/admin/notes/bugtracker    2012-02-07 06:34:52 +0000
+++ b/admin/notes/bugtracker    2012-07-25 05:48:19 +0000
@@ -125,7 +125,7 @@
 
 The "maintainer email address" is "address@hidden" in most cases.
 
-** To not get acknowledgement mail from the tracker,
+** To not get acknowledgment mail from the tracker,
 add an "X-Debbugs-No-Ack:" header (with any value).  If you use Gnus,
 you can add an element to gnus-posting-styles to do this automatically, eg:
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-07-21 14:48:17 +0000
+++ b/doc/lispref/ChangeLog     2012-07-25 05:48:19 +0000
@@ -1,3 +1,8 @@
+2012-07-25  Paul Eggert  <address@hidden>
+
+       Prefer typical American spelling for "acknowledgment".
+       * intro.texi (Acknowledgments): Rename from Acknowledgements.
+
 2012-07-21  Eli Zaretskii  <address@hidden>
 
        * commands.texi (Special Events): Mention language-change event.

=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi    2012-07-06 04:25:04 +0000
+++ b/doc/lispref/elisp.texi    2012-07-25 05:48:19 +0000
@@ -254,7 +254,7 @@
 * Lisp History::            Emacs Lisp is descended from Maclisp.
 * Conventions::             How the manual is formatted.
 * Version Info::            Which Emacs version is running?
-* Acknowledgements::        The authors, editors, and sponsors of this manual.
+* Acknowledgments::         The authors, editors, and sponsors of this manual.
 
 Conventions
 

=== modified file 'doc/lispref/intro.texi'
--- a/doc/lispref/intro.texi    2012-07-06 07:48:10 +0000
+++ b/doc/lispref/intro.texi    2012-07-25 05:48:19 +0000
@@ -44,7 +44,7 @@
 * Lisp History::        Emacs Lisp is descended from Maclisp.
 * Conventions::         How the manual is formatted.
 * Version Info::        Which Emacs version is running?
-* Acknowledgements::    The authors, editors, and sponsors of this manual.
+* Acknowledgments::     The authors, editors, and sponsors of this manual.
 @end menu
 
 @node Caveats
@@ -523,8 +523,8 @@
 23.1, the value is 1.
 @end defvar
 
address@hidden Acknowledgements
address@hidden Acknowledgements
address@hidden Acknowledgments
address@hidden Acknowledgments
 
   This manual was originally written by Robert Krawitz, Bil Lewis, Dan
 LaLiberte, address@hidden Stallman and Chris Welty, the volunteers of

=== modified file 'doc/lispref/spellfile'
--- a/doc/lispref/spellfile     2011-12-19 06:21:24 +0000
+++ b/doc/lispref/spellfile     2012-07-25 05:48:19 +0000
@@ -1,6 +1,5 @@
 ARPA
 Abbrev
-Acknowledgements
 Alan
 Arnold
 Autoloading

=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1   2012-06-10 13:20:58 +0000
+++ b/doc/man/emacs.1   2012-07-25 05:48:19 +0000
@@ -634,7 +634,7 @@
 .SH AUTHORS
 .I Emacs
 was written by Richard Stallman and the Free Software Foundation.
-For detailed credits and acknowledgements, see the GNU Emacs manual.
+For detailed credits and acknowledgments, see the GNU Emacs manual.
 .
 .
 .

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-07-14 02:08:32 +0000
+++ b/doc/misc/ChangeLog        2012-07-25 05:48:19 +0000
@@ -1,3 +1,12 @@
+2012-07-25  Paul Eggert  <address@hidden>
+
+       Prefer typical American spelling for "acknowledgment".
+       * calc.texi (History and Acknowledgments): Rename from
+       History and Acknowledgements.
+       * idlwave.texi (Acknowledgments):
+       * ses.texi (Acknowledgments):
+       * woman.texi (Acknowledgments): Rename from Acknowledgements.
+
 2012-07-09  Paul Eggert  <address@hidden>
 
        Rename configure.in to configure.ac (Bug#11603).

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2012-05-28 23:35:09 +0000
+++ b/doc/misc/calc.texi        2012-07-25 05:48:19 +0000
@@ -218,7 +218,7 @@
 * Notations Used in This Manual::
 * Demonstration of Calc::
 * Using Calc::
-* History and Acknowledgements::
+* History and Acknowledgments::
 @end menu
 
 @node What is Calc, About This Manual, Getting Started, Getting Started
@@ -582,7 +582,7 @@
 Press @key{DEL} repeatedly to remove any leftover results from the stack.
 To exit from Calc, press @kbd{q} or @kbd{C-x * c} again.
 
address@hidden Using Calc, History and Acknowledgements, Demonstration of Calc, 
Getting Started
address@hidden Using Calc, History and Acknowledgments, Demonstration of Calc, 
Getting Started
 @section Using Calc
 
 @noindent
@@ -1148,8 +1148,8 @@
 its initial state:  Empty stack, and initial mode settings.
 @end table
 
address@hidden History and Acknowledgements,  , Using Calc, Getting Started
address@hidden History and Acknowledgements
address@hidden History and Acknowledgments,  , Using Calc, Getting Started
address@hidden History and Acknowledgments
 
 @noindent
 Calc was originally started as a two-week project to occupy a lull
@@ -27779,7 +27779,7 @@
 input units.
 
 If you want to disallow using inconsistent units, you can set the customizable 
variable
address@hidden to @code{t} (@pxref{Customizing Calc}).  In this case, 
address@hidden to @code{t} (@pxref{Customizing Calc}).  In this case,
 if you request units which are inconsistent with the original units, you will 
be warned about
 it and no conversion will occur.
 
@@ -35597,15 +35597,15 @@
 @end defvar
 
 @defvar calc-ensure-consistent-units
-When converting units, the variable @code{calc-ensure-consistent-units} 
-determines whether or not the target units need to be consistent with the 
+When converting units, the variable @code{calc-ensure-consistent-units}
+determines whether or not the target units need to be consistent with the
 original units.  If @code{calc-ensure-consistent-units} is @code{nil}, then
-the target units don't need to have the same dimensions as the original units; 
-for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 
m/s}.   
-If  @code{calc-ensure-consistent-units} is address@hidden, then the target 
units 
-need to have the same dimensions as the original units; for example, 
converting 
address@hidden ft/s} to @samp{m} will result in an error, since @samp{ft/s} and 
@samp{m} 
-have different dimensions. The default value of 
@code{calc-ensure-consistent-units} 
+the target units don't need to have the same dimensions as the original units;
+for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 
m/s}.
+If @code{calc-ensure-consistent-units} is address@hidden, then the target units
+need to have the same dimensions as the original units; for example, converting
address@hidden ft/s} to @samp{m} will result in an error, since @samp{ft/s} and 
@samp{m}
+have different dimensions. The default value of 
@code{calc-ensure-consistent-units}
 is @code{nil}.
 @end defvar
 

=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi     2012-02-28 08:17:21 +0000
+++ b/doc/misc/idlwave.texi     2012-07-25 05:48:19 +0000
@@ -71,7 +71,7 @@
 * Getting Started::             Tutorial
 * The IDLWAVE Major Mode::      The mode for editing IDL programs
 * The IDLWAVE Shell::           The mode for running IDL as an inferior program
-* Acknowledgements::            Who did what
+* Acknowledgments::             Who did what
 * Sources of Routine Info::     How does IDLWAVE know about routine XYZ
 * HTML Help Browser Tips::
 * Configuration Examples::      The user is king
@@ -2361,7 +2361,7 @@
 Normal hook.  Executed when @file{idlwave.el} is loaded.
 @end defopt
 
address@hidden The IDLWAVE Shell, Acknowledgements, The IDLWAVE Major Mode, Top
address@hidden The IDLWAVE Shell, Acknowledgments, The IDLWAVE Major Mode, Top
 @chapter The IDLWAVE Shell
 @cindex IDLWAVE shell
 @cindex Major mode, @code{idlwave-shell-mode}
@@ -3273,9 +3273,9 @@
 (three underscores) are replaced by the indicated expression.
 @end defopt
 
address@hidden Acknowledgements, Sources of Routine Info, The IDLWAVE Shell, Top
address@hidden Acknowledgements
address@hidden Acknowledgements
address@hidden Acknowledgments, Sources of Routine Info, The IDLWAVE Shell, Top
address@hidden Acknowledgments
address@hidden Acknowledgments
 @cindex Maintainer, of IDLWAVE
 @cindex Authors, of IDLWAVE
 @cindex Contributors, to IDLWAVE
@@ -3352,7 +3352,7 @@
 @noindent
 Thanks to everyone!
 
address@hidden Sources of Routine Info, HTML Help Browser Tips, 
Acknowledgements, Top
address@hidden Sources of Routine Info, HTML Help Browser Tips, 
Acknowledgments, Top
 @appendix Sources of Routine Info
 
 @cindex Sources of routine information

=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi  2012-06-10 13:20:58 +0000
+++ b/doc/misc/sc.texi  2012-07-25 05:48:19 +0000
@@ -221,7 +221,7 @@
 @cindex nested citations
 @cindex citation
 
-A @dfn{citation} is the acknowledgement of the original author of a mail
+A @dfn{citation} is the acknowledgment of the original author of a mail
 message in the body of the reply.  There are two basic citation styles
 which Supercite supports.  The first, called @dfn{nested citations} is
 an anonymous form of citation; in other words, an indication is made

=== modified file 'doc/misc/ses.texi'
--- a/doc/misc/ses.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/ses.texi 2012-07-25 05:48:19 +0000
@@ -71,7 +71,7 @@
 * Advanced Features::           Want to know more?
 * For Gurus::                   Want to know @emph{even more}?
 * Index::                       Concept, Function and Variable Index
-* Acknowledgements::            Acknowledgements
+* Acknowledgments::             Acknowledgments
 * GNU Free Documentation License:: The license for this documentation.
 @end menu
 
@@ -927,15 +927,15 @@
 @end table
 
 @c ===================================================================
address@hidden Index, Acknowledgements, For Gurus, Top
address@hidden Index, Acknowledgments, For Gurus, Top
 @unnumbered Index
 
 @printindex cp
 
 @c ===================================================================
 
address@hidden Acknowledgements, GNU Free Documentation License, Index, Top
address@hidden Acknowledgements
address@hidden Acknowledgments, GNU Free Documentation License, Index, Top
address@hidden Acknowledgments
 
 Coding by:
 @quotation
@@ -976,7 +976,7 @@
 
 @c ===================================================================
 
address@hidden GNU Free Documentation License, , Acknowledgements, Top
address@hidden GNU Free Documentation License, , Acknowledgments, Top
 @appendix GNU Free Documentation License
 @include doclicense.texi
 

=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi       2012-02-29 08:11:23 +0000
+++ b/doc/misc/woman.texi       2012-07-25 05:48:19 +0000
@@ -94,7 +94,7 @@
 * Log::                 The *WoMan-Log* Buffer
 * Technical::           Technical Details
 * Bugs::                Reporting Bugs
-* Acknowledgements::    Acknowledgements
+* Acknowledgments::     Acknowledgments
 * GNU Free Documentation License:: The license for this documentation.
 * Command Index::       Command Index
 * Variable Index::      Variable Index
@@ -1306,7 +1306,7 @@
 
 @c ===================================================================
 
address@hidden Bugs, Acknowledgements, Technical, Top
address@hidden Bugs, Acknowledgments, Technical, Top
 @comment  node-name,  next,  previous,  up
 @chapter Reporting Bugs
 @cindex reporting bugs
@@ -1331,10 +1331,10 @@
 
 @c ===================================================================
 
address@hidden Acknowledgements, GNU Free Documentation License, Bugs, Top
address@hidden Acknowledgments, GNU Free Documentation License, Bugs, Top
 @comment  node-name,  next,  previous,  up
address@hidden Acknowledgements
address@hidden acknowledgements
address@hidden Acknowledgments
address@hidden acknowledgments
 
 For Heather, Kathryn and Madelyn, the women in my life (although they
 will probably never use it)!
@@ -1388,7 +1388,7 @@
 @page
 
 
address@hidden GNU Free Documentation License, Command Index, Acknowledgements, 
Top
address@hidden GNU Free Documentation License, Command Index, Acknowledgments, 
Top
 @appendix GNU Free Documentation License
 @include doclicense.texi
 

=== modified file 'leim/SKK-DIC/SKK-JISYO.L'
--- a/leim/SKK-DIC/SKK-JISYO.L  2011-06-12 10:37:40 +0000
+++ b/leim/SKK-DIC/SKK-JISYO.L  2012-07-25 05:48:19 +0000
@@ -34,7 +34,7 @@
 ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;;
-;; ACKNOWLEDGEMENT
+;; ACKNOWLEDGMENT
 ;;
 ;; ????????????SKK ?????????????????????????? 1 ??????????????????????
 ;; ???????????????????????? (????) ???????????????????? scratch ??????

=== modified file 'leim/ja-dic/ja-dic.el'
--- a/leim/ja-dic/ja-dic.el     2011-02-26 09:48:22 +0000
+++ b/leim/ja-dic/ja-dic.el     2012-07-25 05:48:19 +0000
@@ -47,7 +47,7 @@
 ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;;
-;; ACKNOWLEDGEMENT
+;; ACKNOWLEDGMENT
 ;;
 ;; ????????????SKK ?????????????????????????? 1 ??????????????????????
 ;; ???????????????????????? (????) ???????????????????? scratch ??????

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-25 02:38:36 +0000
+++ b/lisp/ChangeLog    2012-07-25 05:48:19 +0000
@@ -1,3 +1,9 @@
+2012-07-25  Paul Eggert  <address@hidden>
+
+       Prefer typical American spelling for "acknowledgment".
+       * vc/add-log.el (change-log-acknowledgment): Rename from
+       change-log-acknowledgement, with an alias for the old name.
+
 2012-07-25  Jay Belanger  <address@hidden>
 
        * calc-alg.el (math-simplify-divide): Don't cross multiply

=== modified file 'lisp/completion.el'
--- a/lisp/completion.el        2012-05-04 23:16:47 +0000
+++ b/lisp/completion.el        2012-07-25 05:48:19 +0000
@@ -228,7 +228,7 @@
 ;; superior to that of the LISPM version.
 ;;
 ;;-----------------------------------------------
-;; Acknowledgements
+;; Acknowledgments
 ;;-----------------------------------------------
 ;;  Cliff Lasser (address@hidden), Kevin Herbert (address@hidden),
 ;;  address@hidden, address@hidden, address@hidden,

=== modified file 'lisp/emulation/cua-rect.el'
--- a/lisp/emulation/cua-rect.el        2012-04-19 17:20:26 +0000
+++ b/lisp/emulation/cua-rect.el        2012-07-25 05:48:19 +0000
@@ -21,7 +21,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Acknowledgements
+;;; Acknowledgments
 
 ;; The rectangle handling and display code borrows from the standard
 ;; GNU emacs rect.el package and the rect-mark.el package by Rick

=== modified file 'lisp/emulation/viper.el'
--- a/lisp/emulation/viper.el   2012-04-09 13:05:48 +0000
+++ b/lisp/emulation/viper.el   2012-07-25 05:48:19 +0000
@@ -103,8 +103,8 @@
 ;;  (require 'viper)
 ;;
 
-;;; Acknowledgements:
-;;  -----------------
+;;; Acknowledgments:
+;;  ----------------
 ;;  Bug reports and ideas contributed by many users have helped
 ;;  improve Viper and the various versions of VIP.
 ;;  See the on-line manual for a complete list of contributors.

=== modified file 'lisp/hippie-exp.el'
--- a/lisp/hippie-exp.el        2012-01-19 07:21:25 +0000
+++ b/lisp/hippie-exp.el        2012-07-25 05:48:19 +0000
@@ -156,7 +156,7 @@
 ;;  opposite situation to occur, that `hippie-expand' misses some
 ;;  suggestion because it thinks it has already tried it.
 ;;
-;;  Acknowledgement
+;;  Acknowledgment
 ;;
 ;;  I want to thank Mikael Djurfeldt in discussions with whom the idea
 ;;  of this function took form.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2012-06-20 15:51:34 +0000
+++ b/lisp/ido.el       2012-07-25 05:48:19 +0000
@@ -279,7 +279,7 @@
 ;; can be used by other packages to read a buffer name, a file name,
 ;; or a directory name in the `ido' way.
 
-;;; Acknowledgements
+;;; Acknowledgments
 
 ;; Infinite amounts of gratitude goes to Stephen Eglen <address@hidden>
 ;; who wrote iswitch-buffer mode - from which I ripped off 99% of the code

=== modified file 'lisp/iswitchb.el'
--- a/lisp/iswitchb.el  2012-05-04 06:02:23 +0000
+++ b/lisp/iswitchb.el  2012-07-25 05:48:19 +0000
@@ -233,7 +233,7 @@
 
 ;;; TODO
 
-;;; Acknowledgements
+;;; Acknowledgments
 
 ;; Thanks to Jari Aalto <address@hidden> for help with the
 ;; first version of this package, iswitch-buffer.  Thanks also to many

=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el     2012-06-06 18:13:09 +0000
+++ b/lisp/mail/emacsbug.el     2012-07-25 05:48:19 +0000
@@ -212,7 +212,7 @@
 
        (insert ".  Please check that
 the From: line contains a valid email address.  After a delay of up
-to one day, you should receive an acknowledgement at that address.
+to one day, you should receive an acknowledgment at that address.
 
 Please write in English if possible, as the Emacs maintainers
 usually do not have translators for other languages.\n\n")))

=== modified file 'lisp/mail/mspools.el'
--- a/lisp/mail/mspools.el      2012-04-09 13:05:48 +0000
+++ b/lisp/mail/mspools.el      2012-07-25 05:48:19 +0000
@@ -83,7 +83,7 @@
 ;; Useful settings for VM
 ;; vm-auto-get-new-mail should be t (the default).
 
-;; Acknowledgements
+;; Acknowledgments
 ;; Thanks to address@hidden (Jonathan Doughty) for help with code for
 ;; setting up vm-spool-files.
 

=== modified file 'lisp/mail/rfc2368.el'
--- a/lisp/mail/rfc2368.el      2012-01-19 07:21:25 +0000
+++ b/lisp/mail/rfc2368.el      2012-07-25 05:48:19 +0000
@@ -33,7 +33,7 @@
 ;;
 ;;   this is intended as a replacement for mailto.el
 ;;
-;; acknowledgements:
+;; acknowledgments:
 ;;
 ;;   the functions that deal w/ unhexifying in this file were basically
 ;; taken from w3 -- i hope to replace them w/ something else soon OR

=== modified file 'lisp/progmodes/cmacexp.el'
--- a/lisp/progmodes/cmacexp.el 2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/cmacexp.el 2012-07-25 05:48:19 +0000
@@ -80,7 +80,7 @@
 ;;   making comments visible in the expansion.
 ;; - All work is done in core memory, no need for temporary files.
 
-;; ACKNOWLEDGEMENTS ==================================================
+;; ACKNOWLEDGMENTS ===================================================
 
 ;; A lot of thanks to Don Maszle who did a great work of testing, bug
 ;; reporting and suggestion of new features.  This work has been

=== modified file 'lisp/progmodes/ebnf-yac.el'
--- a/lisp/progmodes/ebnf-yac.el        2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/ebnf-yac.el        2012-07-25 05:48:19 +0000
@@ -73,8 +73,8 @@
 ;; example: this_is_a_valid.name, Another_EXAMPLE, mIxEd.CaSe.
 ;;
 ;;
-;; Acknowledgements
-;; ----------------
+;; Acknowledgments
+;; ---------------
 ;;
 ;; Thanks to Matthew K. Junker <address@hidden> for the suggestion to deal
 ;; with %right, %left and %prec pragmas.  His suggestion was extended to deal

=== modified file 'lisp/progmodes/ebnf2ps.el'
--- a/lisp/progmodes/ebnf2ps.el 2012-04-22 13:58:00 +0000
+++ b/lisp/progmodes/ebnf2ps.el 2012-07-25 05:48:19 +0000
@@ -1128,8 +1128,8 @@
 ;; . Optimizations...
 ;;
 ;;
-;; Acknowledgements
-;; ----------------
+;; Acknowledgments
+;; ---------------
 ;;
 ;; Thanks to Eli Zaretskii <address@hidden> for some doc fixes.
 ;;

=== modified file 'lisp/progmodes/vhdl-mode.el'
--- a/lisp/progmodes/vhdl-mode.el       2012-06-02 10:56:09 +0000
+++ b/lisp/progmodes/vhdl-mode.el       2012-07-25 05:48:19 +0000
@@ -102,7 +102,7 @@
 ;; VHDL Mode distribution.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Acknowledgements
+;; Acknowledgments
 
 ;; Electrification ideas by Bob Pack <address@hidden>
 ;; and Steve Grout.
@@ -4499,7 +4499,7 @@
     (mra) architecture is selected.  If another architecture is desired, it
     can be marked as most-recently-analyzed (speedbar menu) before
     generating the configuration.
- 
+
       Note: Configurations of subcomponents (i.e. hierarchical configuration
     declarations) are currently not considered when displaying
     configurations in speedbar.
@@ -6979,7 +6979,7 @@
                     (save-excursion
                       (goto-char new)
                       (eq new (progn (back-to-indentation) (point)))))
-               (setq placeholder new)))        
+               (setq placeholder new)))
          (vhdl-add-syntax 'statement-cont placeholder)
          (if begin-after-ip
              (vhdl-add-syntax 'block-open)))

=== modified file 'lisp/vc/add-log.el'
--- a/lisp/vc/add-log.el        2012-04-09 13:05:48 +0000
+++ b/lisp/vc/add-log.el        2012-07-25 05:48:19 +0000
@@ -223,13 +223,15 @@
 (define-obsolete-face-alias 'change-log-function-face
   'change-log-function "22.1")
 
-(defface change-log-acknowledgement
+(defface change-log-acknowledgment
   '((t (:inherit font-lock-comment-face)))
   "Face for highlighting acknowledgments."
   :version "21.1"
   :group 'change-log)
+(define-obsolete-face-alias 'change-log-acknowledgement
+  'change-log-acknowledgment "24.2")
 (define-obsolete-face-alias 'change-log-acknowledgement-face
-  'change-log-acknowledgement "22.1")
+  'change-log-acknowledgment "22.1")
 
 (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)")
 (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*")
@@ -271,14 +273,14 @@
     ;; Function of change.
     ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function))
     ;;
-    ;; Acknowledgements.
+    ;; Acknowledgments.
     ;; Don't include plain "From" because that is vague;
     ;; we want to encourage people to say something more specific.
     ;; Note that the FSF does not use "Patches by"; our convention
     ;; is to put the name of the author of the changes at the top
     ;; of the change log entry.
     ("\\(^\\( +\\|\t\\)\\|  \\)\\(Thanks to\\|Patch\\(es\\)? by\\|Report\\(ed 
by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
-     3 'change-log-acknowledgement))
+     3 'change-log-acknowledgment))
   "Additional expressions to highlight in Change Log mode.")
 
 (defun change-log-search-file-name (where)

=== modified file 'lisp/vc/ediff.el'
--- a/lisp/vc/ediff.el  2012-07-16 10:19:56 +0000
+++ b/lisp/vc/ediff.el  2012-07-25 05:48:19 +0000
@@ -101,7 +101,7 @@
 ;;  and on any buffer.
 
 
-;;; Acknowledgements:
+;;; Acknowledgments:
 
 ;; Ediff was inspired by Dale R. Worley's <address@hidden> emerge.el.
 ;; Ediff would not have been possible without the help and encouragement of

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2012-07-19 14:38:01 +0000
+++ b/lisp/vc/vc-git.el 2012-07-25 05:48:19 +0000
@@ -772,7 +772,7 @@
           (list (cons (nth 1 vc-git-root-log-format)
                       (nth 2 vc-git-root-log-format)))
         (append
-         `((,log-view-message-re (1 'change-log-acknowledgement)))
+         `((,log-view-message-re (1 'change-log-acknowledgment)))
          ;; Handle the case:
          ;; user: address@hidden
          '(("^Author:[ \t]+\\(address@hidden)"
@@ -788,8 +788,8 @@
             (1 'change-log-name)
             (2 'change-log-email))
            ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
-            (1 'change-log-acknowledgement)
-            (2 'change-log-acknowledgement))
+            (1 'change-log-acknowledgment)
+            (2 'change-log-acknowledgment))
            ("^Date:   \\(.+\\)" (1 'change-log-date))
            ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
 

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2012-06-08 16:39:49 +0000
+++ b/lisp/whitespace.el        2012-07-25 05:48:19 +0000
@@ -309,8 +309,8 @@
 ;;                             buffer is visited or written.
 ;;
 ;;
-;; Acknowledgements
-;; ----------------
+;; Acknowledgments
+;; ---------------
 ;;
 ;; Thanks to felix (EmacsWiki) for keeping highlight when switching between
 ;; major modes on a file.

=== modified file 'lisp/windmove.el'
--- a/lisp/windmove.el  2012-01-21 10:02:34 +0000
+++ b/lisp/windmove.el  2012-07-25 05:48:19 +0000
@@ -118,7 +118,7 @@
 ;;     (setq windmove-window-distance-delta 2)
 ;;
 
-;; Acknowledgements:
+;; Acknowledgments:
 ;;
 ;; Special thanks to Julian Assange (address@hidden), whose
 ;; change-windows-intuitively.el predates Windmove, and provided the

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2012-07-11 23:13:41 +0000
+++ b/lisp/woman.el     2012-07-25 05:48:19 +0000
@@ -368,8 +368,8 @@
 ;; http://cm.bell-labs.com/7thEdMan/
 
 
-;; Acknowledgements
-;; ================
+;; Acknowledgments
+;; ===============
 
 ;; For Heather, Kathryn and Madelyn, the women in my life
 ;; (although they will probably never use it)!