diff --git a/ChangeLog b/ChangeLog index a6d5148c777..cf2d0dc250c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2013-01-16 Paul Eggert + + Merge from gnulib, incorporating: + 2013-01-16 largefile: port better to Mac OS X 10.5 + 2013-01-15 stdint: fix build with Android's Bionic fox x86 + +2013-01-16 Paul Eggert + + * configure.ac: Document that --enable-gcc-warnings emits errors. + (Bug#13448) + +2013-01-13 Glenn Morris + + * make-dist: Add options for xz compression and no compression. + +2013-01-12 Paul Eggert + + Enable conservative stack scanning for all architectures. + Suggested by Stefan Monnier in + . + * configure.ac (GC_MARK_STACK): Remove. + +2013-01-11 Paul Eggert + + * lib/getopt_.h: Remove trailing CRs that crept in. + +2013-01-11 Eli Zaretskii + + * lib/getopt_.h: Regenerate. + +2013-01-10 Paul Eggert + + Merge from gnulib, incorporating: + 2013-01-09 stdlib: port to Solaris 2.6 + 2013-01-04 Glenn Morris * info/dir: Add htmlfontify. diff --git a/admin/ChangeLog b/admin/ChangeLog index fa001ede6cb..5da0bf0c67d 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2013-01-15 Dmitry Antipov + + * coccinelle/xsave.cocci: Semantic patch to adjust users of + XSAVE_POINTER and XSAVE_INTEGER macros. + 2013-01-03 Glenn Morris * check-doc-strings: Update for CVS->bzr, moved lispref/ directory. @@ -132,15 +137,14 @@ * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): Remove. - (bovine-grammar-expand-form): Test for emacs-major-version. + (bovine-grammar-expand-form): Test for emacs-major-version. * grammars/c.by: Add EXPLICIT to keyword tokens. + Add %provide token. - * grammars/f90.by: Add %provide token. - - * grammar/grammar.wy (semantic-grammar-lexer): Remove, since it + * grammars/grammar.wy (semantic-grammar-lexer): Remove, since it was copied to grammar.el. New %provide token to generate prefix - which conforms with Emacs conventions. Remove lexer definition, + which conforms with Emacs conventions. Remove lexer definition, which is now in grammar.el. 2012-09-27 Glenn Morris @@ -184,7 +188,7 @@ 2012-09-13 Paul Eggert Simplify SIGIO usage (Bug#12408). - * CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL) + * CPP-DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL) (BROKEN_SIGPTY, NO_TERMIO): Remove. 2012-09-11 Paul Eggert diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 34763083e9a..efcc63081b5 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -16,9 +16,6 @@ maintainer has been found so far. 1. ============================================================================== -Richard Stallman - ??? - Jason Rumney W32 @@ -71,13 +68,6 @@ Jay Belanger etc/calccard.tex doc/misc/calc.texi -Michael Olson - ERC - lisp/erc/* - etc/ERC-NEWS - doc/misc/erc.texi - lisp/emacs-lisp/tq.el - Bastien Guerry Org lisp/org/* @@ -87,9 +77,6 @@ Bastien Guerry 2. ============================================================================== -Steven Tamm - MacOS - Eli Zaretskii doc/* lispref/* diff --git a/admin/coccinelle/xsave.cocci b/admin/coccinelle/xsave.cocci new file mode 100644 index 00000000000..5172bb55b33 --- /dev/null +++ b/admin/coccinelle/xsave.cocci @@ -0,0 +1,11 @@ +// Adjust users of XSAVE_POINTER and XSAVE_INTEGER. +@@ +expression E; +@@ +( +- XSAVE_POINTER (E) ++ XSAVE_POINTER (E, 0) +| +- XSAVE_INTEGER (E) ++ XSAVE_INTEGER (E, 1) +) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 573bb218c43..3825ac49278 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -2,22 +2,46 @@ Instructions to create pretest or release tarballs. -- originally written by Gerd Moellmann, amended by Francesco Potortì with the initial help of Eli Zaretskii -For each step, check for possible errors. -0. Decide on versions of automake and autoconf, and ensure you will +Steps to take before starting on the first pretest in any release sequence: + +1. Decide on versions of automake and autoconf, and ensure you will have them available for the duration of the release process. +2. Consider increasing the value of the variable + `customize-changed-options-previous-release' in cus-edit.el to + refer to a newer version of Emacs. (This is probably needed only + when preparing the first pretest for a major Emacs release.) + Commit cus-edit.el if changed. + + +General steps (for each step, check for possible errors): + 1. `bzr update' (for a bound branch), or `bzr pull'. - bzr status # check for locally modified files + bzr status # check for locally modified files 2. Bootstrap to make 100% sure all elc files are up-to-date, and to make sure that the later tagged version will bootstrap, should it be necessary to check it out. 3. Regenerate the etc/AUTHORS file: - M-: (require 'authors) RET, M-x authors RET, save the *Authors* buffer. - If there are errors that relate to syntactically incorrect - ChangeLog entries, consider fixing them and repeating. + M-: (require 'authors) RET + M-x authors RET + + There is almost guaranteed to be an "*Authors Errors*" buffer with + problems caused by certain bad ChangeLog entries. You can ignore + the very old ones (eg lisp/erc has a lot). If there are errors + related to new entries (especially entries that are new since the + last pretest), see if you can fix them. If there was a ChangeLog + typo, fix it. If a file was deleted or renamed, consider adding + an appropriate entry to authors-ignored-files, authors-valid-file-names, + or authors-renamed-files-alist. + + If necessary, repeat M-x authors after making those changes. + Save the "*Authors*" buffer as etc/AUTHORS. + Check the diff looks reasonable. Maybe add entries to + authors-ambiguous-files or authors-aliases, and repeat. + Commit any fixes to ChangeLogs or authors.el. 4. Set the version number (M-x load-file RET admin/admin.el RET, then M-x set-version RET). For a release, add released ChangeLog @@ -26,20 +50,18 @@ For each step, check for possible errors. For a pretest, start at version .90. After .99, use .990 (so that it sorts). - If needed, increment the value of the variable - `customize-changed-options-previous-release' in cus-edit.el to - refer to a newer release of Emacs. (This is probably needed only - when preparing a major Emacs release, or branching for it.) - 5. autoreconf -i -I m4 --force make bootstrap -6. Commit etc/AUTHORS, all the files changed by M-x set-version, and - lisp/cus-edit.el (if modified). - Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. +6. Copy lisp/loaddefs.el to lisp/ldefs-boot.el. + + Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed + by M-x set-version. For a release, also commit the ChangeLog files in all directories. -7. make-dist --snapshot. Check the contents of the new tar with +7. ./make-dist --snapshot --no-compress + + Check the contents of the new tar with admin/diff-tar-files against an older tar file. Some old pretest tarballs may be found at ; old release tarballs are at . @@ -49,15 +71,15 @@ For each step, check for possible errors. something like `find . | sort' in a clean bzr tree, and compare the results against the new tar contents. -8. tar -zxf emacs-NEW.tar.gz; cd emacs-NEW - ./configure && make && make -n install +8. tar -xf emacs-NEW.tar; cd emacs-NEW + ./configure --prefix=/tmp/emacs && make && make install Use `script' or M-x compile to save the compilation log in compile-NEW.log and compare it against an old one. The easiest way to do that is to visit the old log in Emacs, change the version number of the old Emacs to __, do the same with the new log and do M-x ediff. Especially check that Info files aren't built. -9. cd EMACS_ROOT_DIR; bzr tag TAG +9. cd EMACS_ROOT_DIR && bzr tag TAG TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release. Shortly before the release, cut the version branch also, and open @@ -65,16 +87,37 @@ For each step, check for possible errors. be sent to the emacs-diffs mailing list (by default, the list normally only gets commits to the trunk). -10. Now you should upload the files to the GNU ftp server. In order to +10. Decide what compression schemes to offer. + For a release, at least gz and xz: + gzip --best -c emacs-NEW.tar > emacs-NEW.tar.gz + xz -c emacs-NEW.tar > emacs-NEW.tar.xz + + Now you should upload the files to the GNU ftp server. In order to do that, you must be registered as an Emacs maintainer and have your GPG key acknowledged by the ftp people. For instructions, see http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html - You can use the gnulib script "gnupload" to upload each FILE, like this: - gnupload --to alpha.gnu.org:emacs/pretest FILE (for a pretest) - gnupload --to ftp.gnu.org:emacs FILE (for a release) + The simplest method is to use the gnulib + script "build-aux/gnupload" to upload each FILE, like this: + + For a pretest: + gnupload [--user your@gpg.key.email] --to alpha.gnu.org:emacs/pretest \ + FILE.gz FILE.xz ... + + For a release: + gnupload [--user your@gpg.key.email] --to ftp.gnu.org:emacs \ + FILE.gz FILE.xz ... + + You only need the --user part if you have multiple GPG keys and do + not want to use the default. + Obviously, if you do not have a fast uplink, be prepared for the + upload to take a while. + + + If you prefer to do it yourself rather than use gnupload: + + For each FILE, create a detached GPG binary signature and a + clearsigned directive file like this: - Instead of using gnupload, for each FILE, create a detached GPG - binary signature and a clearsigned directive file like this: gpg -b FILE echo directory: emacs/pretest > FILE.directive (for a pretest) echo directory: emacs > FILE.directive (for a release) @@ -85,13 +128,12 @@ For each step, check for possible errors. For a pretest, place the files in /incoming/alpha instead, so that they appear on ftp://alpha.gnu.org/. - For a release, upload xz and bz2 tarfiles as well; this can save a lot - of bandwidth. - 11. After five minutes, verify that the files are visible at - ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at + ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or ftp://ftp.gnu.org/gnu/emacs/ for a release. + Download them and check the signatures. Check they build. + 12. For a pretest, announce it on emacs-devel and info-gnu-emacs@gnu.org. For a release, also announce it on info-gnu@gnu.org. (Probably bcc the info- addresses to make it less likely that people will @@ -99,3 +141,4 @@ For each step, check for possible errors. 13. For a release, update the Emacs homepage in the web repository. Also add the new NEWS file as NEWS.xx.y. + Maybe regenerate the html manuals, update the FAQ, etc, etc. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 16d8887ed5a..5983a0f9617 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -288,4 +288,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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 . +along with GNU Emacs. If not, see http://www.gnu.org/licenses/. diff --git a/autogen/config.in b/autogen/config.in index 68f2c426ffa..b02b1fe462a 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -160,10 +160,6 @@ along with GNU Emacs. If not, see . */ /* Mark a secondary stack, like the register stack on the ia64. */ #undef GC_MARK_SECONDARY_STACK -/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not - known to work. */ -#undef GC_MARK_STACK - /* Define if setjmp is known to save all registers relevant for conservative garbage collection in the jmp_buf. */ #undef GC_SETJMP_WORKS diff --git a/autogen/configure b/autogen/configure index e1df418eede..8b9b502fb19 100755 --- a/autogen/configure +++ b/autogen/configure @@ -2076,9 +2076,10 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-largefile omit support for large files - --enable-gcc-warnings turn on lots of GCC warnings. This is intended for - developers, and may generate false alarms when used - with older or non-GNU development tools. + --enable-gcc-warnings turn on lots of GCC warnings/errors. This is + intended for developers, and may generate false + alarms when used with older or non-GNU development + tools. --enable-link-time-optimization build emacs with link-time optimization. This is supported only for GCC since 4.5.0. @@ -15707,14 +15708,7 @@ esac - - case $opsys in - aix4-2 | hpux* | unixware) - $as_echo "#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE" >>confdefs.h - - ;; - gnu-linux | gnu-kfreebsd ) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15739,9 +15733,6 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h -else - $as_echo "#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE" >>confdefs.h - fi rm -f conftest.err conftest.$ac_ext ;; diff --git a/configure.ac b/configure.ac index 4d1ef0b6783..4c1c5a8e738 100644 --- a/configure.ac +++ b/configure.ac @@ -627,7 +627,7 @@ fi AC_ARG_ENABLE([gcc-warnings], [AS_HELP_STRING([--enable-gcc-warnings], - [turn on lots of GCC warnings. This is intended for + [turn on lots of GCC warnings/errors. This is intended for developers, and may generate false alarms when used with older or non-GNU development tools.])], [case $enableval in @@ -3777,22 +3777,13 @@ case $opsys in esac -dnl These won't be used automatically yet. We also need to know, at least, +dnl This won't be used automatically yet. We also need to know, at least, dnl that the stack is continuous. AH_TEMPLATE(GC_SETJMP_WORKS, [Define if setjmp is known to save all registers relevant for conservative garbage collection in the jmp_buf.]) -AH_TEMPLATE(GC_MARK_STACK, [Define to GC_USE_GCPROS_AS_BEFORE if - conservative garbage collection is not known to work.]) - case $opsys in - aix4-2 | hpux* | unixware) - dnl Conservative garbage collection has not been tested, so for now - dnl play it safe and stick with the old-fashioned way of marking. - AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) - ;; - dnl Not all the architectures are tested, but there are Debian packages dnl for SCM and/or Guile on them, so the technique must work. See also dnl comments in alloc.c concerning setjmp and gcc. @@ -3807,8 +3798,7 @@ case $opsys in #else # error "setjmp not known to work on this arch" #endif - ]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1), - AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) ) + ]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1)) ;; esac diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 601949af88e..1b5bdc8fb53 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2013-01-07 Bastien Guerry + + * help.texi (Apropos): Document `apropos-user-option' and update + the doc for `apropos-variable'. + 2013-01-05 Glenn Morris * text.texi (HTML Mode): Remove deleted nxml C-RET binding. diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 0a0a3865d2d..75b250d0f40 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -295,11 +295,16 @@ search for noninteractive functions too. Search for functions and variables. Both interactive functions (commands) and noninteractive functions can be found by this. -@item M-x apropos-variable -@findex apropos-variable +@item M-x apropos-user-option +@findex apropos-user-option Search for user-customizable variables. With a prefix argument, search for non-customizable variables too. +@item M-x apropos-variable +@findex apropos-variable +Search for variables. With a prefix argument, search for +customizable variables only. + @item M-x apropos-value @findex apropos-value Search for variables whose values match the specified pattern. With a diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 31c81e62ac1..2631bdf708a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,12 @@ +2013-01-09 Glenn Morris + + * commands.texi (Interactive Codes): + Whitespace does not terminate interactive "S". (Bug#13393) + +2013-01-06 Chong Yidong + + * windows.texi (Vertical Scrolling): Fix typos (Bug#13267). + 2013-01-05 Glenn Morris * display.texi (Overlay Properties): Mention field. (Bug#13364) diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index f3589fc2edd..846d6f3a4a9 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -471,10 +471,10 @@ Arbitrary text, read in the minibuffer and returned as a string these characters in the input.) Prompt. @item S -An interned symbol whose name is read in the minibuffer. Any whitespace -character terminates the input. (Use @kbd{C-q} to include whitespace in -the string.) Other characters that normally terminate a symbol (e.g., -parentheses and brackets) do not do so here. Prompt. +An interned symbol whose name is read in the minibuffer. Terminate +the input with either @kbd{C-j} or @key{RET}. Other characters that +normally terminate a symbol (e.g., whitespace, parentheses and +brackets) do not do so here. Prompt. @item U A key sequence or @code{nil}. Can be used after a @samp{k} or diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index b3c143496dd..792002add81 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -3054,10 +3054,11 @@ pixels. In this case, the return value is @var{lines}. @end defun @defvar auto-window-vscroll -If this variable is non-@code{nil}, the line-move, scroll-up, and -scroll-down functions will automatically modify the vertical scroll -position to scroll through display rows that are taller than the height -of the window, for example in the presence of large images. +If this variable is non-@code{nil}, the @code{line-move}, +@code{scroll-up}, and @code{scroll-down} functions will automatically +modify the vertical scroll position to scroll through display rows +that are taller than the height of the window, for example in the +presence of large images. @end defvar @node Horizontal Scrolling diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d756f4fd0f0..95c7ac7b233 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,48 @@ +2013-01-13 Bastien Guerry + + * org.texi (Installation): Simplify. + +2013-01-13 François Allisson (tiny change) + + * org.texi (Handling links): Update the mention to the obsolete + variable `org-link-to-org-use-id' with a mention to the newer + variable `org-id-link-to-org-use-id'. Mention the need to load + the org-id library. + +2013-01-10 Michael Albinus + + * tramp.texi (Default Host): Introduce `tramp-default-host-alist'. + +2013-01-09 Bastien Guerry + + * org.texi (Pushing to MobileOrg): Add footnote about using + symbolic links in `org-directory'. + (Timestamps, Deadlines and scheduling): Use `diary-float' instead + of the now obsolete alias `org-float'. + (TODO basics): Add `org-use-fast-todo-selection' to the variable + index. Fix description of TODO keywords cycling. + (Advanced features): Add missing argument for @item. + (Storing searches): Add index entries and a note about + *-tree agenda views. + (Structure editing): Document `org-mark-element' and + `org-mark-subtree'. + (Tag inheritance): Document `org-agenda-use-tag-inheritance'. + +2013-01-08 Juri Linkov + + * info.texi (Go to node): Mention the abbreviated format + `(FILENAME)' equal to `(FILENAME)Top'. (Bug#13365) + +2013-01-06 Andreas Schwab + + * autotype.texi: Remove undefined command @subtitlefont. + * cc-mode.texi: Likewise. + + * org.texi (Advanced features): Use `@w{ }' instead of `@ ' in + @item argument. + (Property searches): Use \\ instead of @backslashchar{}. + * pgg.texi (VERSION): Move @set below @setfilename. + 2013-01-05 Andreas Schwab * ada-mode.texi: Remove braces from @title argument. diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index ad6a2902b1e..137ed6b43e8 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -37,8 +37,7 @@ modify this GNU manual.'' @center @titlefont{Autotyping} @sp 2 -@center @subtitlefont{Convenient features for text that you enter -frequently in Emacs} +@center Convenient features for text that you enter frequently in Emacs @sp 2 @center Daniel Pfeiffer @center additions by Dave Love diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index f63c6c54a16..55b7028101a 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -188,7 +188,7 @@ modify this GNU manual.'' @center @titlefont{CC Mode 5.32} @sp 2 -@center @subtitlefont{A GNU Emacs mode for editing C and C-like languages} +@center A GNU Emacs mode for editing C and C-like languages @sp 2 @center Barry A. Warsaw, Martin Stjernholm, Alan Mackenzie diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 911cdd3cd5f..6cb8942bf15 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -7,7 +7,7 @@ @copying This manual documents Htmlfontify, a source code -> crosslinked + -formatted + syntax colorised html transformer. +formatted + syntax colorized html transformer. Copyright @copyright{} 2002, 2003, 2013 Free Software Foundation, Inc. @@ -56,7 +56,7 @@ modify this GNU manual.'' @menu * Introduction:: About Htmlfontify. * Usage & Examples:: How to use Htmlfontify. -* Customisation:: Fine-tuning Htmlfontify's behaviour. +* Customization:: Fine-tuning Htmlfontify's behaviour. * Requirements:: External programs used by Htmlfontify. * GNU Free Documentation License:: The license for this documentation. * Index:: Index of contents. @@ -68,7 +68,7 @@ modify this GNU manual.'' Htmlfontify provides a means of converting individual Emacs buffers, source files, or entire source trees to html, preserving formatting -and Emacs colorisation / syntax highlighting as much as possible +and Emacs colorization / syntax highlighting as much as possible through careful application of CSS stylesheets and html tags. It can also turn instances of functions, methods and (for some @@ -76,7 +76,7 @@ languages) variables and other constructs and items into links to their definitions, and create an index file (or files) of all such symbols, also linked to their points of definition. -Htmlfontify also provides several customisation items, which should +Htmlfontify also provides several customization items, which should allow it to mesh more-or-less seamlessly with various templating or publishing systems (in the event, for instance, that you don't want to produce the html pages directly). @@ -93,7 +93,7 @@ batch mode. @menu * Interactive:: Using Htmlfontify interactively. * Non-interactive:: Using Htmlfontify from elisp. -* Variables:: Variables (other than customisation entries). +* Variables:: Variables (other than customization entries). * Data Structures:: Important data structures. * Examples:: Example(s) of Htmlfontify in use. @end menu @@ -236,7 +236,7 @@ color map specified, otherwise it uses Htmlfontify's built in map. @end lisp Return a @code{defface} style alist of possible specifications for -@var{face}, with any entries resulting from user customisation +@var{face}, with any entries resulting from user customization (@code{custom-set-faces}) taking precedence. See also: @ref{hfy-default-face-def} @@ -268,10 +268,10 @@ does things like deferring fontification until a section of the buffer is exposed and rendered, or until Emacs is idle for a while. Sometimes, in non-interactive circumstances, or if it can't see X, it doesn't bother with some of the harder stuff. While this is all great from the perspective -of a user waiting for Emacs to load a 20000 line file and colorise it, +of a user waiting for Emacs to load a 20000 line file and colorize it, it's a pain from the point of view from non-interactive code. This function lies, cheats, steals and generally bullies Emacs into fontifying a buffer -from start to finish, with all the extra frills, whether it thinks it nneds +from start to finish, with all the extra frills, whether it thinks it needs to or not. Oh yes: it operates on the current buffer. @item hfy-link-style-string @@ -861,7 +861,7 @@ As per @ref{hfy-color} but for background colors. (hfy-kludge-cperl-mode) @end lisp -cperl mode does its damndest not to do some of its fontification when not +cperl mode does its best to not do some of its fontification when not in a windowing system---we try to trick it@dots{} @item hfy-href @@ -1044,7 +1044,7 @@ Convert an Emacs @code{:width} attribute to a CSS font-stretch attribute. @section Variables @cindex variables -Important variables that are not customisation items: +Important variables that are not customization items: @table @code @@ -1234,7 +1234,7 @@ main-content <=MAIN_CONTENT;\n" rtfm-section file style rtfm-section file)) ;; Here's the function I actually call---it asks me for a section label, ;; and source and destination directories, and then binds a couple of -;; customisation variable in a let before calling htmlfontify: +;; customization variable in a let before calling htmlfontify: (defun rtfm-build-source-docs (section srcdir destdir) (interactive "s section[eg- emacs / p4-blame]:\nD source-dir: \nD output-dir: ") @@ -1252,11 +1252,11 @@ main-content <=MAIN_CONTENT;\n" rtfm-section file style rtfm-section file)) (htmlfontify-copy-and-link-dir srcdir destdir ".src" ".html"))) @end lisp -@node Customisation -@chapter Customisation -@cindex variables (customisation) +@node Customization +@chapter Customization +@cindex variables (customization) -Htmlfontify provides the following variable and customisation entries: +Htmlfontify provides the following variable and customization entries: @table @code @comment AUTOGENERATED BLOCK @@ -1394,7 +1394,7 @@ when @ref{hfy-display-class} has been set (the normal Htmlfontify way of extracting potentially non-current face information doesn't necessarily work for @code{default}). -For example, I customise this to: +For example, I customize this to: @lisp ((t :background "black" :foreground "white" :family "misc-fixed")) @@ -1405,7 +1405,7 @@ For example, I customise this to: @anchor{hfy-init-kludge-hooks} List of functions to call when starting htmlfontify-buffer to do any -kludging necessary to get highlighting modes to bahave as you want, even +kludging necessary to get highlighting modes to behave as you want, even when not running under a window system. @item hfy-shell-file-name @@ -1421,7 +1421,7 @@ Currently this is only required/used when using GNU etags, see @vindex hfy-optimisations @anchor{hfy-optimisations} -Optimisations to turn on. So far, the following have been implemented: +Optimizations to turn on. So far, the following have been implemented: @table @option @item merge-adjacent-tags @@ -1454,7 +1454,8 @@ Suppress hyperlinking between files highlighted by different modes. @end table -Note: like compiler optimisations, these optimise the _output_ of the code, +Note: like compiler optimizations, these optimize the @emph{output} of +the code, not the processing of the source itself, and are therefore likely to slow Htmlfontify down, at least a little. Except for skip-refontification, which can never slow you down, but may result in incomplete fontification. @@ -1470,7 +1471,7 @@ Regex to remove from the