diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 6579cd6c7d1..8140b43e783 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -840,7 +840,7 @@ See @ref{hfy-display-class} for details of valid values for @var{class}. @end lisp Find face in effect at point P@. If overlays are to be considered -(see @ref{hfy-optimisations}) then this may return a @code{defface} style +(see @ref{hfy-optimizations}) then this may return a @code{defface} style list of face properties instead of a face symbol. @item hfy-bgcol @@ -950,7 +950,7 @@ Is @var{srcdir}/@var{file} text? Uses @ref{hfy-istext-command} to determine thi (hfy-opt @var{symbol}) @end lisp -Is @ref{hfy-optimisations} member @var{symbol} set or not? +Is @ref{hfy-optimizations} member @var{symbol} set or not? @item hfy-dirname @findex hfy-dirname @@ -1395,9 +1395,9 @@ for the more complex shell interactions needed by Htmlfontify. Currently this is only required/used when using GNU etags, see @ref{hfy-etags-cmd-alist} for details. -@item hfy-optimisations -@vindex hfy-optimisations -@anchor{hfy-optimisations} +@item hfy-optimizations +@vindex hfy-optimizations +@anchor{hfy-optimizations} Optimizations to turn on. So far, the following have been implemented: diff --git a/etc/NEWS b/etc/NEWS index 6de8f030d94..cc3c6d1c235 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -756,6 +756,12 @@ integers. ** New function `set-binary-mode' allows to switch a standard stream of the Emacs process to binary I/O mode. +** Miscellaneous name change + +For consistency with the usual Emacs spelling, the Lisp variable +`hfy-optimisations' has been renamed to `hfy-optimizations'. +The old name should still work, as an obsolescent alias. + * Changes in Frames and Windows Code in Emacs 25.1 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7d4dd5bac0..94b4be74584 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-04-06 Paul Eggert + + Spelling fix for 'hfy-optimizations' + * htmlfontify.el (hfy-optimizations): Rename from hfy-optimisations, + with an obsolete alias. All uses changed. + 2015-04-06 Fabián Ezequiel Gallina python.el: Enhance docstring detection following PEP-257. diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index bf8a97352c6..457c1511af8 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -15547,7 +15547,7 @@ c-set-fl-decl-start. * progmodes/cc-mode.el (c-common-init, c-after-change): - Changes due to pluralisation of c-before-font-lock-functions. + Changes due to pluralization of c-before-font-lock-functions. (c-set-fl-decl-start): New function, extracted from c-font-lock-enclosing-decls and enhanced. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 591c6446ec0..442326cc7f0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1692,7 +1692,7 @@ 2013-06-18 Lars Magne Ingebrigtsen * shr.el (shr-tag-table): Insert the images after the table, so that - they're not covered by the table colourisation, which often looked + they're not covered by the table colorization, which often looked awkward. (shr-tag-dl, shr-tag-dt, shr-tag-dd): Add support for
,
and
. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 719cb82b989..97e7d0f4446 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -440,7 +440,7 @@ and so on." (background (choice (const :tag "Dark" dark ) (const :tag "Bright" light ))) )) -(defcustom hfy-optimisations (list 'keep-overlays) +(defcustom hfy-optimizations (list 'keep-overlays) "Optimizations to turn on: So far, the following have been implemented:\n merge-adjacent-tags: If two (or more) span tags are adjacent, identical and separated by nothing more than whitespace, they will @@ -475,6 +475,7 @@ which can never slow you down, but may result in incomplete fontification." (const :tag "body-text-only" body-text-only )) :group 'htmlfontify :tag "optimizations") +(define-obsolete-variable-alias 'hfy-optimisations 'hfy-optimizations "25.1") (defvar hfy-tags-cache nil "Alist of the form:\n @@ -606,7 +607,7 @@ in a windowing system - try to trick it..." (defun hfy-opt (symbol) "Is option SYMBOL set." - (memq symbol hfy-optimisations)) + (memq symbol hfy-optimizations)) (defun hfy-default-header (file style) "Default value for `hfy-page-header'. @@ -1197,7 +1198,7 @@ MAP is the invisibility map as returned by `hfy-find-invisible-ranges'." ;; -- v (defun hfy-face-at (p) "Find face in effect at point P. -If overlays are to be considered (see `hfy-optimisations') then this may +If overlays are to be considered (see `hfy-optimizations') then this may return a `defface' style list of face properties instead of a face symbol." ;;(message "hfy-face-at");;DBUG ;; Fix-me: clean up, remove face-name etc @@ -1795,8 +1796,8 @@ FILE, if set, is the file name." It is assumed that STRING has text properties that allow it to be fontified. This is a simple convenience wrapper around `htmlfontify-buffer'." - (let* ((hfy-optimisations-1 (copy-sequence hfy-optimisations)) - (hfy-optimisations (add-to-list 'hfy-optimisations-1 + (let* ((hfy-optimizations-1 (copy-sequence hfy-optimizations)) + (hfy-optimizations (add-to-list 'hfy-optimizations-1 'skip-refontification))) (with-temp-buffer (insert string) diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index 29bc87875a1..6c74fb3eabd 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el @@ -262,7 +262,8 @@ This style is much the same as that of \"OrgFixedWidthBlock\" except that the foreground and background colors are set according to the default face identified by the `htmlfontify'.") -(defvar hfy-optimisations) +(defvar hfy-optimizations) +(define-obsolete-variable-alias 'hfy-optimisations 'hfy-optimizations "25.1") (defvar org-odt-embedded-formulas-count 0) (defvar org-odt-embedded-images-count 0) (defvar org-odt-image-size-probe-method @@ -3116,8 +3117,8 @@ and prefix with \"OrgSrc\". For example, (" " "") (" " ""))) (hfy-face-to-css 'org-odt-hfy-face-to-css) - (hfy-optimisations-1 (copy-sequence hfy-optimisations)) - (hfy-optimisations (add-to-list 'hfy-optimisations-1 + (hfy-optimizations-1 (copy-sequence hfy-optimizations)) + (hfy-optimizations (add-to-list 'hfy-optimizations-1 'body-text-only)) (hfy-begin-span-handler (lambda (style text-block text-id text-begins-block-p)