(jit-lock-function): Check for the actual defer-timer rather than just

defer-time, in case defer-time has been changed but the timer isn't running yet.
(jit-lock-deferred-fontify): Correspondingly let-bind defer-timer.

2 files changed, 235 insertions, 256 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5e8515946a..2878b8b9784 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,15 @@
+2006-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-function): Check for the actual defer-timer
+        rather than just defer-time, in case defer-time has been changed but
+        the timer isn't running yet.
+        (jit-lock-deferred-fontify): Correspondingly let-bind defer-timer.
+
 2006-03-19  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * help-mode.el (help-follow-symbol): New function.  Essentially
-        identical to the old `help-follow', but do not let `push-button'
-        do the work when on an xref.
+        * help-mode.el (help-follow-symbol): New function.
+        Essentially identical to the old `help-follow', but do not let
+        `push-button' do the work when on an xref.
         (help-mode-map): Bind `help-follow-symbol' to "C-c C-c".
 
 2006-03-19  Richard Stallman  <rms@gnu.org>
@@ -20,8 +27,7 @@
 2006-03-19  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
         * textmodes/bibtex.el (bibtex-include-OPTkey)
-        (bibtex-entry-field-alist, bibtex-generate-url-list): Mark as
-        risky.
+        (bibtex-entry-field-alist, bibtex-generate-url-list): Mark as risky.
         (bibtex-autokey-name-case-convert)
         (bibtex-autokey-titleword-case-convert): Make these the aliases
         for the following two variables.
@@ -32,7 +38,7 @@
         bibtex-font-lock-crossref sublists.
         (bibtex-mode): Revert 2005-12-30 change (which made
         completion-ignore-case buffer-local).
-        (bibtex-url): Simplify
+        (bibtex-url): Simplify.
 
 2006-03-19  Kim F. Storm  <storm@cua.dk>
 
@@ -60,8 +66,8 @@
 
 2006-03-18  Eli Zaretskii  <eliz@gnu.org>
 
-        * term/w32-win.el (mouse-set-font): Mention
-        w32-list-proportional-fonts in the doc string.
+        * term/w32-win.el (mouse-set-font):
+        Mention w32-list-proportional-fonts in the doc string.
 
 2006-03-18  Kim F. Storm  <storm@cua.dk>
 
@@ -69,8 +75,8 @@
         (ido-unc-hosts): New user option to explicitly define list of know
         UNC-style hosts for completion.
         (ido-cache-unc-host-shares-time): New user option.
-        (ido-is-unc-root, ido-is-unc-host, ido-cache-unc-valid): New
-        helper functions for UNC file-name support.
+        (ido-is-unc-root, ido-is-unc-host, ido-cache-unc-valid):
+        New helper functions for UNC file-name support.
         (ido-may-cache-directory): Check for UNC host.  Simplify.
         (ido-wash-history): Clean out old UNC hosts.
         (ido-nonreadable-directory-p): UNC hosts are always readable.
@@ -205,8 +211,8 @@
 
         * progmodes/gdb-ui.el (gdb-var-list): Change order of first two
         elements.
-        (gdb-find-watch-expression): Make it work for arrays too.  Follow
-        change to gdb-var-list.
+        (gdb-find-watch-expression): Make it work for arrays too.
+        Follow change to gdb-var-list.
         (gud-watch): Allow the user to enter variable name with a prexix
         arg.  Create keybindings.
         (gdb-var-create-handler, gdb-var-evaluate-expression-handler)
@@ -214,8 +220,7 @@
         (gdb-var-delete, gdb-edit-value, gdb-speedbar-expand-node)
         (gdb-var-list-children-handler-1, gdb-var-update-handler-1):
         Follow change to gdb-var-list.
-        (gdb-starting): Don't show the overlay arrows when program is
-        running.
+        (gdb-starting): Don't show the overlay arrows when program is running.
 
         * progmodes/gud.el (gud-speedbar-buttons): Follow change to
         gdb-var-list.
@@ -223,27 +228,32 @@
 2006-03-14  Bill Wohler  <wohler@newt.com>
 
         * image.el (image-load-path-for-library): Pass value of path
-        rather than symbol.  Always return list of directories.  Guarantee
-        that image directory comes first.
+        rather than symbol.  Always return list of directories.
+        Guarantee that image directory comes first.
 
 2006-03-14  Alan Mackenzie  <acm@muc.de>
 
-        * font-core.el: New function/variable
-        font-lock-extend-region\(-function\)?.
+        * font-core.el (font-lock-extend-region\(-function\)?.):
+        New function/variable.
 
-        * font-lock.el (font-lock-after-change-function): Call
-        font-lock-extend-region.  Obey font-lock-lines-before.
+        * font-lock.el (font-lock-after-change-function):
+        Call font-lock-extend-region.  Obey font-lock-lines-before.
         (font-lock-default-fontify-region): Remove reference to
         font-lock-lines-before.
 
-        * jit-lock.el (jit-lock-after-change): Call
-        font-lock-extend-region.  Obey font-lock-lines-before.
+        * jit-lock.el (jit-lock-after-change):
+        Call font-lock-extend-region.  Obey font-lock-lines-before.
 
 2006-03-14  David Ponce  <david@dponce.com>
 
         * tree-widget.el (tree-widget-themes-load-path)
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
 
+2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
+        wwidth.
+
 2006-03-13  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc) <defgroup>: Add link to manual.
@@ -264,8 +274,8 @@
         themes sub-directory found in tree-widget-themes-load-path.
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
         (tree-widget--locate-sub-directory): Return all occurrences.
-        (tree-widget-themes-path): New function.  Replace
-        tree-widget-themes-directory, and return a list of directories.
+        (tree-widget-themes-path): New function.
+        Replace tree-widget-themes-directory, and return a list of directories.
         (tree-widget-set-parent-theme)
         (tree-widget-lookup-image): Use it.
 
@@ -410,8 +420,8 @@
 
 2006-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
-        * files.el (hack-local-variables-confirm): Set
-        coding-system-for-read to nil before writing to .emacs.
+        * files.el (hack-local-variables-confirm):
+        Set coding-system-for-read to nil before writing to .emacs.
 
         * arc-mode.el (archive-extract): Check if an existing buffer name
         comes from a different archive.
@@ -433,8 +443,8 @@
 
 2006-03-07  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: Move defvars out of eval-when-compile.  Use
-        buffer-file-name variable.
+        * textmodes/org.el: Move defvars out of eval-when-compile.
+        Use buffer-file-name variable.
         (org-agenda-file-to-end, org-agenda-file-to-front): Remove unused
         arg `file'.
         (org-level-faces): Remove startup dependency.
@@ -449,8 +459,7 @@
         (org-tag): New face.
         (org-get-level-face): New function.
         (org-set-font-lock-defaults): Simplify setup for headlines.
-        (org-complete): Pass common substring to
-        `display-completion-list'.
+        (org-complete): Pass common substring to `display-completion-list'.
 
 2006-03-06  David Ponce  <david@dponce.com>
 
@@ -622,9 +631,8 @@
 
         * t-mouse.el: New file.
         (t-mouse-tty): Use with-temp-buffer.  Add more terminal types.
-        (t-mouse-lispy-buffer-posn-from-coords): Remove.  Use the C
-        primitive...
-        (t-mouse-make-event-element): ...posn-at-x-y instead.
+        (t-mouse-lispy-buffer-posn-from-coords): Remove.
+        (t-mouse-make-event-element): Use posn-at-x-y instead.
         (t-mouse-make-event): Deal with Fedora Core 3.
         (t-mouse-make-event): Don't sink the `stupid text mode menubar'.
         (t-mouse-mouse-position-function): New function.  Use it instead
@@ -657,8 +665,7 @@
         * textmodes/reftex-index.el (reftex-index-map): Add `follow-mouse'
         binding.
 
-        * textmodes/reftex-toc.el (reftex-toc-map): Add `follow-mouse'
-        binding.
+        * textmodes/reftex-toc.el (reftex-toc-map): Add `follow-mouse' binding.
 
         * textmodes/reftex-sel.el (reftex-select-label-map)
         (reftex-select-bib-map): Add `follow-mouse' binding.
@@ -4236,20 +4243,20 @@
         CC Mode update to 5.31.
 
         * progmodes/cc-subword.el: Add a dummy `c-subword-mode' for
-        Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.  We
-        might do this function properly in the future).
+        Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.
+        We might do this function properly in the future).
 
-        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el: New
-        macros c-sentence-end and c-default-value-sentence end, to cope
+        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el:
+        New macros c-sentence-end and c-default-value-sentence end, to cope
         with Emacs 22's new function `sentence-end'.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-show-syntactic-information): Solved the
+        * progmodes/cc-cmds.el (c-show-syntactic-information): Solve the
         compat issue using `c-put-overlay' and `c-delete-overlay'.
 
-        * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay): New
-        compat macros to handle overlays/extents.
+        * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay):
+        New compat macros to handle overlays/extents.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4270,20 +4277,19 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-fonts.el (c-make-syntactic-matcher): New internal
-        helper.
+        * progmodes/cc-fonts.el (c-make-syntactic-matcher):
+        New internal helper.
 
         (c-cpp-matchers, c-basic-matchers-before): Use the `eval'
         construct to make the indirect face lookup work in XEmacs.
 
         (c-cpp-matchers): Append the negation char face to the existing
-        fontification, so that the cpp face doesn't disappear.  Use
-        `c-make-syntactic-matcher' to avoid negation chars in comments and
-        strings.
+        fontification, so that the cpp face doesn't disappear.
+        Use `c-make-syntactic-matcher' to avoid negation chars in comments
+        and strings.
 
         * progmodes/cc-fonts.el (c-negation-char-face-name): New variable
-        to map to `font-lock-negation-char-face' in emacsen where it
-        exists.
+        to map to `font-lock-negation-char-face' in emacsen where it exists.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4306,18 +4312,17 @@
         (i) Insert a binding for C-c C-backspace into
         c-bind-special-erase-keys which works in TTYs.
         (ii) Make sure that when file styles are used, any explicitly
-        given style variables take priority over those in the style.  Do
-        this by calling `hack-local-variables' a second time.
+        given style variables take priority over those in the style.
+        Do this by calling `hack-local-variables' a second time.
 
         * progmodes/cc-vars.el: Add language specific customization
         widgets for AWK to c-doc-comment-style, c-require-final-newline
-        and c-default-style.  Add a defcustom for awk-mode-hook.  Give
-        c-syntactic-element and c-syntactic-context doc-strings by
-        directly setting their `variable-documentation' propery.  This
-        allows Emacs 22.1 to read these with C-h v.
+        and c-default-style.  Add a defcustom for awk-mode-hook.
+        Give c-syntactic-element and c-syntactic-context doc-strings by
+        directly setting their `variable-documentation' propery.
+        This allows Emacs 22.1 to read these with C-h v.
 
-        * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan
-        Monnier).
+        * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan Monnier).
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
@@ -4343,8 +4348,8 @@
         * progmodes/cc-mode.el: Give c-hungry-backspace and
         c-hungry-delete-forward permanent key bindings.
 
-        * progmodes/cc-cmds.el (c-electric-semi&comma): Bind
-        c-syntactic-context for calls to "criteria functions", for
+        * progmodes/cc-cmds.el (c-electric-semi&comma):
+        Bind c-syntactic-context for calls to "criteria functions", for
         consistency with other calls to user functions.
 
         * progmodes/cc-cmds.el (c-indent-command): Expunge use of
@@ -4358,7 +4363,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el (c-on-identifier): Fixed bug when at the
+        * progmodes/cc-engine.el (c-on-identifier): Fix bug when at the
         first char of an identifier.
 
         * progmodes/cc-engine.el (c-on-identifier): Handle the "operator
@@ -4383,14 +4388,14 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el (c-cpp-matchers, c-basic-matchers-before):
-        Incorporated the patterns added in the Emacs development branch
+        Incorporate the patterns added in the Emacs development branch
         for the new Emacs 22 face `font-lock-negation-char-face'.
 
         * progmodes/cc-fonts.el (c-invalid-face-name): Use "red1" instead
         of "red" since it stands out better in xterms and DOS terminals.
 
-        * progmodes/cc-engine.el (c-literal-faces): Added
-        `font-lock-comment-delimiter-face' which is new in Emacs 22.
+        * progmodes/cc-engine.el (c-literal-faces):
+        Add `font-lock-comment-delimiter-face' which is new in Emacs 22.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4398,14 +4403,13 @@
         forcibly enable c-electric-flag.
 
         * progmodes/cc-vars.el, cc-cmds.el: New clean-up
-        `comment-close-slash' on c-electric-slash: if enabled, typing `/'
-        just after the comment-prefix of a C-style comment will close that
-        comment.
+        `comment-close-slash' on c-electric-slash: if enabled, typing `/' just
+        after the comment-prefix of a C-style comment will close that comment.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el (c-basic-matchers-before)
-        (c-complex-decl-matchers): Fixed the "not-arrow-prefix" regexp used
+        (c-complex-decl-matchers): Fix the "not-arrow-prefix" regexp used
         in Pike.
 
         * progmodes/cc-langs.el (c-other-op-syntax-tokens): Only C++ has
@@ -4414,10 +4418,10 @@
         * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el
         (c-cpp-message-directives, c-cpp-include-directives)
         (c-opt-cpp-macro-define, c-opt-cpp-macro-define-start)
-        (c-cpp-expr-directives): Introduced new language constants to
+        (c-cpp-expr-directives): Introduce new language constants to
         control cpp syntax in a cleaner way.
 
-        (c-cpp-expr-functions): Renamed from c-cpp-defined-fns.
+        (c-cpp-expr-functions): Rename from c-cpp-defined-fns.
 
         (c-cpp-matchers, c-forward-to-cpp-define-body): Use them.
 
@@ -4449,22 +4453,21 @@
         (c-guess-basic-syntax): Handle C++ operator identifiers in
         declarations.
 
-        * progmodes/cc-langs.el (c-assignment-operators): Added the
+        * progmodes/cc-langs.el (c-assignment-operators): Add the
         trigraph version of ^= too.
 
-        * progmodes/cc-langs.el (c-assignment-operators): Added the
+        * progmodes/cc-langs.el (c-assignment-operators): Add the
         trigraph version of |= in C++.
 
-        * progmodes/cc-fonts.el (c-font-lock-declarators): Handle
-        `c-decl-hangon-kwds' after the identifier name.
+        * progmodes/cc-fonts.el (c-font-lock-declarators):
+        Handle `c-decl-hangon-kwds' after the identifier name.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): When deciding
         whether an arglist is "nonempty", ignore a comment after the open
-        paren if it isn't followed by a non-comment token on the same
-        line.
+        paren if it isn't followed by a non-comment token on the same line.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Case 4: Enable
-        heuristics below the point to cope with classes inside special
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Case 4:
+        Enable heuristics below the point to cope with classes inside special
         brace lists in Pike.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
@@ -4503,12 +4506,11 @@
         * progmodes/cc-cmds.el: Add `c-bytecomp-defun's for
         c-\(forward\|backward\)-subword.
         (c-update-modeline): Add the new modeline flag `l' for
-        `c-electric-flag'.  Make the auto-newline flag `a' dependent on
-        `l'.
-        (c-toggle-auto-state): Rename it to `c-toggle-auto-newline'.  Make
-        the old name an alias of the new name.
+        `c-electric-flag'.  Make the auto-newline flag `a' dependent on `l'.
+        (c-toggle-auto-state): Rename it to `c-toggle-auto-newline'.
+        Make the old name an alias of the new name.
         (c-toggle-electric-state): New function.
-        c-electric-\(pound\|brace\|slash\|star\|semi&comma\|colon\|lt-gt\|paren\|continued-statement\):
+        (c-electric-\(pound\|brace\|slash\|star\|semi&comma\|colon\|lt-gt\|paren\|continued-statement\)):
         Adapt these functions to do electric things only when
         c-electric-flag is non-nil.
         (c-point-syntax, c-brace-newlines, c-try-oneliner): Extract these
@@ -4524,18 +4526,17 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el (c-show-syntactic-information): Show the
-        anchor position(s) using faces.  Thanks to Masatake YAMATO for the
-        idea.
+        anchor position(s) using faces.  Thanks to Masatake YAMATO for the idea.
 
         * progmodes/cc-mode.el, cc-cmds.el, cc-defs.el, cc-engine.el
-        (c-submode-indicators): Changed name from `c-auto-hungry-string'
+        (c-submode-indicators): Change name from `c-auto-hungry-string'
         since it's now used to track another submode.
 
-        (c-update-modeline): Converted to function and extended to check
+        (c-update-modeline): Convert to function and extended to check
         `c-subword-move-mode'.
 
         (c-forward-into-nomenclature, c-backward-into-nomenclature):
-        Converted to compat aliases for `c-forward-subword' and
+        Convert to compat aliases for `c-forward-subword' and
         `c-backward-subword'.
 
         * progmodes/cc-subword.el: New functions and minor mode to handle
@@ -4578,10 +4579,10 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el (c-forward-label): Fixed fontification of
+        * progmodes/cc-engine.el (c-forward-label): Fix fontification of
         macros inside labels.
 
-        * progmodes/cc-engine.el (c-looking-at-bos): Obsoleted in favor of
+        * progmodes/cc-engine.el (c-looking-at-bos): Obsolete in favor of
         `c-at-statement-start-p' and `c-at-expression-start-p'.
 
         * progmodes/cc-defs.el (c-tnt-chng-record-state): Don't signal an
@@ -4595,9 +4596,8 @@
         like `c-at-statement-start-p' that additionally recognizes commas
         and expression parentheses as delimiters.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Added flag
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Add flag
         to avoid heuristics that doesn't work for unclosed blocks.
-
         (c-at-statement-start-p): New function.
 
         * progmodes/cc-engine.el, cc-fonts.el: Fixes in handling of
@@ -4612,54 +4612,53 @@
         (c-just-after-func-arglist-p, c-guess-basic-syntax)
         (c-basic-matchers-before): Use it.
 
-        (c-font-lock-objc-iip-decl): Removed.
+        (c-font-lock-objc-iip-decl): Remove.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): Some improvement
         in the template arglist recognition.
 
-        * progmodes/cc-styles.el (c-style-alist): Fixed several
+        * progmodes/cc-styles.el (c-style-alist): Fix several
         inconsistencies in the Whitesmith style.
 
         * progmodes/cc-align.el (c-lineup-after-whitesmith-blocks):
         New lineup function to get lines after Whitesmith style blocks
         correctly indented.
 
-        (c-lineup-whitesmith-in-block): Backed out the compensation for
+        (c-lineup-whitesmith-in-block): Back out the compensation for
         opening parens since it's done using `add' lists in the style
         definition instead.  Don't use the anchor position since it varies
         too much between the syntactic symbols. :P
 
-        * progmodes/cc-vars.el (c-valid-offset): Updated.
+        * progmodes/cc-vars.el (c-valid-offset): Update.
 
-        * progmodes/cc-engine.el (c-evaluate-offset): Extended to handle
+        * progmodes/cc-engine.el (c-evaluate-offset): Extend to handle
         lists where the offsets are combined according to several
-        different methods: `first', `min', `max', and `add'.  Report
-        offset evaluation errors with `c-benign-error' so that some kind
+        different methods: `first', `min', `max', and `add'.
+        Report offset evaluation errors with `c-benign-error' so that some kind
         of reindentation still is done.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Anchor
-        `arglist-intro' the same way as `arglist-cont-nonempty' and
+        * progmodes/cc-engine.el (c-guess-basic-syntax):
+        Anchor `arglist-intro' the same way as `arglist-cont-nonempty' and
         `arglist-close'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed similar
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fix similar
         situations for `arglist-cont-nonempty' and `arglist-close'.
 
-        * progmodes/cc-langs.el (c-opt-identifier-concat-key-depth): New
-        constant.
+        * progmodes/cc-langs.el (c-opt-identifier-concat-key-depth): New const.
 
         * progmodes/cc-defs.el: Use `cc-bytecomp-fboundp' and
         cc-bytecomp-boundp' in a number of places.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a
         macro related issue.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-awk.el: Change the terminology of regexps: A char
-        list is now [asdf], a char class [:alpha:].  Include code for char
-        classes.  Set c-awk-NL-prop on lines ending in open strings.  (Bug
-        fix.)  Add character classes (e.g. "[:alpha:]") into AWK Mode's
-        regexps.
+        list is now [asdf], a char class [:alpha:].
+        Include code for char classes.
+        Set c-awk-NL-prop on lines ending in open strings.  (Bug fix.)
+        Add character classes (e.g. "[:alpha:]") into AWK Mode's regexps.
 
         Remove (nearly all of) the cruft associated with AWK Mode's former
         concept of "virtual semicolons":
@@ -4698,15 +4697,14 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-awk.el: Regexps for analysing AWK code have been
-        moved to near the start of the file.  ^L now separate sections of
-        the file.  New defconsts: c-awk-non-eol-esc-pair-re,
-        c-awk-blank-or-comment-line-re,
-        c-awk-one-line-possibly-open-string-re,
-        c-awk-regexp-one-line-possibly-open-char-class-re,
-        c-awk-one-line-possibly-open-regexp-re,
-        c-awk-one-line-non-syn-ws*-re.  New functions: c-awk-at-vsemi-p,
-        c-awk-vsemi-status-unknown-p.
+        * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the
+        start of the file.  ^L now separate sections of the file.
+        (c-awk-non-eol-esc-pair-re,     c-awk-blank-or-comment-line-re)
+        (c-awk-one-line-possibly-open-string-re)
+        (c-awk-regexp-one-line-possibly-open-char-class-re)
+        (c-awk-one-line-possibly-open-regexp-re)
+        (c-awk-one-line-non-syn-ws*-re): New defonsts.
+        (c-awk-at-vsemi-p, c-awk-vsemi-status-unknown-p): New functions.
 
         Amend the concept of "virtual semicolons" (in the indentation
         engine) for languages like AWK, such that they are now
@@ -4714,12 +4712,12 @@
         the end of the line.  (In AWK Mode, however, the pertinent text
         property is still physically set on the EOL.)  Remove the specific
         tests for awk-mode, thus facilitating the introduction of other
-        language modes where EOLs can end statements.  (Note: The
-        funtionality in cc-cmds.el, specifically
+        language modes where EOLs can end statements.
+        (Note: The funtionality in cc-cmds.el, specifically
         c-beginning/end-of-statement has yet to be amended.)
 
-        * progmodes/cc-defs.el: New macros c-at-vsemi-p,
-        c-vsemi-status-unknown-p.
+        * progmodes/cc-defs.el (c-at-vsemi-p, c-vsemi-status-unknown-p):
+        New macros.
 
         * progmodes/cc-langs.el: Added `#' into AWK Mode's value of
         c-stmt-delim-chars.  New c-lang-defvars: c-at-vsemi-p-fn,
@@ -4729,25 +4727,21 @@
         c-crosses-statement-barrier-p, c-guess-basic-syntax, replace
         numerous awkward forms like
         (if (c-major-mode-is 'awk-mode) (c-awk-prev-line-incomplete-p))
-        with
-        (c-at-vsemi-p).  Fix a few typos.  In c-guess-basic-syntax, new
-        variable before-ws-ip, the place just after char-before-ip
-        appears.
+        with (c-at-vsemi-p).  Fix a few typos.  In c-guess-basic-syntax, new
+        variable before-ws-ip, the place just after char-before-ip appears.
 
         * progmodes/cc-mode.el: Fix what's almost a semantic ambiguity in
         a comment.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-electric-brace): Cleaned up using
+        * progmodes/cc-cmds.el (c-electric-brace): Clean up using
         `c-tentative-buffer-changes'.
 
-        * progmodes/cc-defs.el (c-region-is-active-p): Simplified and
-        converted to macro to choose between Emacs and XEmacs at compile
-        time.
+        * progmodes/cc-defs.el (c-region-is-active-p): Simplify and
+        convert to macro to choose between Emacs and XEmacs at compile time.
 
-        (c-set-region-active): New set counterpart to
-        `c-region-is-active-p'.
+        (c-set-region-active): New set counterpart to `c-region-is-active-p'.
 
         (c-tentative-buffer-changes): New macro to handle temporary buffer
         changes in a convenient way.
@@ -4755,7 +4749,7 @@
         (c-tnt-chng-record-state, c-tnt-chng-cleanup): Internal helpers
         for `c-tentative-buffer-changes'.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Tightened up
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Tighten up
         the checks for paren sexps between the point and the keyword, to
         avoid some false alarms.
 
@@ -4764,23 +4758,22 @@
         parens.  Changed to make use of c-keyword-member' to avoid some
         repeated regexp matches.
 
-        (c-opt-lambda-key, c-opt-inexpr-block-key,
-        c-opt-inexpr-class-key): These language variable are no longer
-        necessary.
+        (c-opt-lambda-key, c-opt-inexpr-block-key, c-opt-inexpr-class-key):
+        These language variable are no longer necessary.
 
         (c-block-stmt-kwds): New language constant used by
         c-looking-at-inexpr-block'.
 
-        (c-guess-basic-syntax): Removed an optional check that looked at
+        (c-guess-basic-syntax): Remove an optional check that looked at
         the existence of the now removed language variables.
 
-        * progmodes/cc-engine.el (c-fdoc-shift-type-backward,
-        c-forward-decl-or-cast-1): Fixed invalid recognition of C++ style
+        * progmodes/cc-engine.el (c-fdoc-shift-type-backward)
+        (c-forward-decl-or-cast-1): Fix invalid recognition of C++ style
         object instantiation expressions as declarations in some contexts.
         This bug only affected languages where the declarator can't be
         enclosed in parentheses.
 
-        * progmodes/cc-styles.el (c-style-alist): Fixed the GNU style to
+        * progmodes/cc-styles.el (c-style-alist): Fix the GNU style to
         insert newlines before and after substatement braces.
 
         * progmodes/cc-engine.el: Improved the heuristics for recognizing
@@ -4790,15 +4783,14 @@
         (c-just-after-func-arglist-p): Rewritten to use
         `c-forward-decl-or-cast-1'.  Now behaves a bit differently too.
 
-        (c-beginning-of-member-init-list): Removed since it isn't used
-        anymore.
+        (c-beginning-of-member-init-list): Remove since it isn't used anymore.
 
-        (c-guess-basic-syntax): Case 5B adapted for the new
-        `c-just-after-func-arglist-p'.  Cases 5B.1 and 5B.3 merged.  Cases
-        5D.1 and 5D.2 removed since they aren't trigged anymore (case 5B.1
+        (c-guess-basic-syntax): Adapt case 5B for the new
+        `c-just-after-func-arglist-p'.  Merge cases 5B.1 and 5B.3.
+        Remove cases 5D.1 and 5D.2 since they aren't trigged anymore (case 5B.1
         covers all cases now).
 
-        * progmodes/cc-defs.el (c-point): Added `bosws' and `eosws'.
+        * progmodes/cc-defs.el (c-point): Add `bosws' and `eosws'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4821,15 +4813,15 @@
         (c-search-uplist-for-classkey): The old one.  It's now a wrapper
         for compatibility.
 
-        (c-add-class-syntax, c-guess-continued-construct,
-        c-guess-basic-syntax): Adapted for `c-looking-at-decl-block'.
+        (c-add-class-syntax, c-guess-continued-construct)
+        (c-guess-basic-syntax): Adapt for `c-looking-at-decl-block'.
 
-        (c-decl-block-key): Changed to tell apart ambiguous and
+        (c-decl-block-key): Change to tell apart ambiguous and
         unambiguous keywords.  Pike specials are now handled directly in
         the code instead.
 
-        (c-block-prefix-disallowed-chars, c-block-prefix-charset): New
-        language constants and variables to make the backward skip in
+        (c-block-prefix-disallowed-chars, c-block-prefix-charset):
+        New language constants and variables to make the backward skip in
         `c-looking-at-decl-block' as tight as possible.
 
         (c-nonsymbol-token-char-list): New language constant.
@@ -4840,7 +4832,7 @@
         * progmodes/cc-defs.el (c-make-bare-char-alt): New helper for
         making char classes for `c-syntactic-skip-backward'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified case
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplify case
         16D - can't be a class-close at that point.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax)
@@ -4851,17 +4843,16 @@
         `c-guess-basic-syntax' never will look at things outside the
         current narrowment now.  The anchor position for `topmost-intro'
         is affected by this, but it was so bogus it was basically useless
-        before, and now it's equally bogus but in a slightly different
-        way.
+        before, and now it's equally bogus but in a slightly different way.
 
         (c-narrow-out-enclosing-class): Gone.
 
         (c-most-enclosing-brace, c-least-enclosing-brace): Don't filter to
         the narrowed region.
 
-        (c-least-enclosing-brace): Removed silly optional argument.
+        (c-least-enclosing-brace): Remove silly optional argument.
 
-        * progmodes/cc-engine.el (c-beginning-of-decl-1): Fixed bug where
+        * progmodes/cc-engine.el (c-beginning-of-decl-1): Fix bug where
         the point could be left directly after an open paren when finding
         the beginning of the first decl in the block.
 
@@ -4886,13 +4877,11 @@
         (c-identifier-start, c-identifier-key): Now completely calculated
         from other constants.
 
-        (c-identifier-last-sym-match): Decommissioned since it's no longer
-        used.
+        (c-identifier-last-sym-match): Decommission since it's no longer used.
 
-        (c-operators): Use `c-identifier-ops'.  Documented
-        `postfix-if-paren'.
+        (c-operators): Use `c-identifier-ops'.  Document `postfix-if-paren'.
 
-        * progmodes/cc-engine.el (c-forward-name): Removed the
+        * progmodes/cc-engine.el (c-forward-name): Remove the
         optimization when c-identifier-key is equal to c-symbol-key since
         it doesn't work in byte compiled files.  Don't record empty
         regions as identifiers.
@@ -4908,13 +4897,13 @@
         * progmodes/cc-defs.el (c-lang-const): Fixes to allow use without
         an explicit language in functions.
 
-        * progmodes/cc-defs.el (c-make-keywords-re): Added an appendable
+        * progmodes/cc-defs.el (c-make-keywords-re): Add an appendable
         variant of adornment.
 
-        * progmodes/cc-langs.el (c-any-class-key): Removed unused language
+        * progmodes/cc-langs.el (c-any-class-key): Remove unused language
         variable.
 
-        (c-type-decl-prefix-key): Removed some now unnecessary cruft from
+        (c-type-decl-prefix-key): Remove some now unnecessary cruft from
         the Pike value.
 
         * progmodes/cc-engine.el (c-on-identifier)
@@ -4922,7 +4911,7 @@
         correctly in `skip-chars-backward'.  Affected the operator lfun
         syntax in Pike.
 
-        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Disabled the
+        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Disable the
         diagnostic message about precompiled language vars not being used.
 
         * progmodes/cc-langs.el (c-paren-nontype-kwds): The GCC keyword
@@ -4932,9 +4921,9 @@
         (c-specifier-key, c-not-decl-init-keywords): Some cleanup using new
         language constants `c-type-start-kwds' and `c-prefix-spec-kwds'.
 
-        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el: Internal
-        cleanups to properly detect the declared identifiers in various
-        declarations.
+        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el:
+        Internal cleanups to properly detect the declared identifiers in
+        various declarations.
 
         (c-decl-start-kwds): New language constant to recognize
         declarations that can start anywhere.  Used for class declarations
@@ -4945,7 +4934,7 @@
         (c-find-decl-spots): Implement `c-decl-start-kwds'.
 
         (c-other-decl-kwds, c-postfix-decl-spec-kwds, c-decl-hangon-kwds)
-        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separated the
+        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separate the
         handling of the compiler specific extension keywords into a new
         language constant `c-decl-hangon-kwds' that defines keyword
         clauses to be ignored in declarations.
@@ -4961,9 +4950,8 @@
         (c-forward-decl-or-cast-1): Recognize the declared identifier in
         class and enum declarations as such and not as part of the type.
 
-        (c-forward-decl-or-cast-1, c-forward-label): Relaxed the
-        interpretation of PRECEDING-TOKEN-END when there's no preceding
-        token.
+        (c-forward-decl-or-cast-1, c-forward-label): Relax the
+        interpretation of PRECEDING-TOKEN-END when there's no preceding token.
 
         (c-forward-decl-or-cast-1): Don't disregard sure signs of
         declarations when there's some syntax error later on.
@@ -4976,7 +4964,7 @@
 
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el
         * cc-mode.el, cc-styles.el, cc-vars.el, cc-align.el, cc-awk.el
-        * cc-cmds.el, cc-defs.el: Changed the policy for marking up
+        * cc-cmds.el, cc-defs.el: Change the policy for marking up
         functions that might do hidden buffer changes: All such internal
         functions are now marked instead of those that don't.
 
@@ -4991,10 +4979,10 @@
         (c-electric-semi&comma, c-electric-colon, c-electric-lt-gt)
         (c-electric-paren, c-electric-continued-statement, c-indent-command)
         (c-indent-region, c-mask-paragraph, c-indent-new-comment-line)
-        (c-context-line-break): Added `c-save-buffer-state' calls to comply
+        (c-context-line-break): Add `c-save-buffer-state' calls to comply
         with the changed semantics of the functions above.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a bug
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a bug
         when macros occur in obscure places.  Optimized the sexp movement
         a bit.
 
@@ -5026,13 +5014,13 @@
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el: Cleaned up the
         label handling.  Labels are now recognized in a uniform and more
         robust way, regardless of context.  Text properties are put on all
-        labels to recognize the following declarations better.  Multiword
-        labels are handled both in indentation and fontification for the
-        benefit of language extensions like Qt.  For consistency, keywords
-        in labels are now fontified with the label face instead.  That
-        also applies to "case" and "default".
+        labels to recognize the following declarations better.
+        Multiword labels are handled both in indentation and fontification for
+        the benefit of language extensions like Qt.  For consistency, keywords
+        in labels are now fontified with the label face instead.
+        That also applies to "case" and "default".
 
-        (c-beginning-of-statement-1): Fixed some bugs in the label
+        (c-beginning-of-statement-1): Fix some bugs in the label
         handling.  Disregard `c-nonlabel-token-key' in labels that begin
         with `c-label-kwds'.
 
@@ -5044,70 +5032,68 @@
 
         (c-forward-label): New function to recognize labels.
 
-        (c-guess-basic-syntax): Replaced uses of `c-label-key' with
+        (c-guess-basic-syntax): Replace uses of `c-label-key' with
         `c-forward-label'.  Moved the label recognition cases (14 and 15)
         earlier since they aren't so context sensitive now.  Handle labels
         on the top level gracefully.  Moved access label recognition to
         the generic label case (CASE 15) - removed CASE 5E.
 
-        (c-font-lock-declarations): Added recognition of labels in the
+        (c-font-lock-declarations): Add recognition of labels in the
         same round since we need to handle labels in parallell with other
         declarations to recognize both accurately.  It should also improve
         speed.
 
-        (c-simple-decl-matchers, c-basic-matchers-after): Moved
-        `c-font-lock-labels' so that it only is used on decoration level 2
+        (c-simple-decl-matchers, c-basic-matchers-after):
+        Move `c-font-lock-labels' so that it only is used on decoration level 2
         since `c-font-lock-declarations' handles it otherwise.
 
-        (c-complex-decl-matchers): Removed the simplistic recognition of
+        (c-complex-decl-matchers): Remove the simplistic recognition of
         access labels.
 
-        (c-decl-prefix-re): Removed the kludges that was necessary to cope
+        (c-decl-prefix-re): Remove the kludges that was necessary to cope
         with labels earlier.
 
         (c-decl-start-re): New language variable to make
         `c-font-lock-declarations' stop for the special protection labels
         in Objective-C that start with `@'.
 
-        (c-label-key): Removed since it's no longer used.
+        (c-label-key): Remove since it's no longer used.
 
         (c-recognize-colon-labels, c-label-prefix-re): New language
-        constants to support recognition of generic colon-terminated
-        labels.
+        constants to support recognition of generic colon-terminated labels.
 
         (c-type-decl-end-used): `c-decl-end' is now used whenever there
         are colon terminated labels.
 
-        * progmodes/cc-align.el (c-lineup-arglist): Fixed bug when the
+        * progmodes/cc-align.el (c-lineup-arglist): Fix bug when the
         first argument starts with a special brace list.
 
         * progmodes/cc-engine.el, cc-fonts.el (c-forward-decl-or-cast-1)
-        (c-font-lock-declarations): Broke out the declaration and cast
+        (c-font-lock-declarations): Break out the declaration and cast
         recognition from `c-font-lock-declarations' to a new function, so
         that it can be used in the indentation engine.
 
-        * progmodes/cc-engine.el (c-find-decl-spots): Fixed bug in backing
+        * progmodes/cc-engine.el (c-find-decl-spots): Fix bug in backing
         up to the start of the literal.  Fixed bug with the point on the
         wrong side of the search limit that could happen when the start
         position is inside a literal.
 
         * progmodes/cc-engine.el (c-parse-state)
-        (c-invalidate-state-cache): Modified the use of `c-state-cache-end'
+        (c-invalidate-state-cache): Modify the use of `c-state-cache-end'
         so that it's kept a little bit back to increase the hit rate.
 
-        (c-parse-state): Changed the macro handling and fixed some
+        (c-parse-state): Change the macro handling and fixed some
         glitches.  Macro context is checked more often than necessary now,
         but otoh less garbage conses are generated.
 
         * progmodes/cc-engine.el (c-parse-state)
         (c-invalidate-state-cache): Cache the last position where
         `c-state-cache' applies.  This can speed up refontification quite
-        a bit in blocks where there are many non-brace parens before the
-        point.
+        a bit in blocks where there are many non-brace parens before the point.
 
         (c-state-cache-end): New variable for this.
 
-        (c-guess-basic-syntax, c-debug-parse-state): Adapted for the new
+        (c-guess-basic-syntax, c-debug-parse-state): Adapt for the new
         cache variable.
 
         * progmodes/cc-engine.el (c-find-decl-spots): Take more care to
@@ -5118,39 +5104,39 @@
         region is a single line inside a literal or macro (typically when
         the current line is refontified).
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified calls
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplify calls
         to `c-add-stmt-syntax' - there's no need to explicitly whack off
         entries from the paren state.
 
-        * progmodes/cc-engine.el (c-add-stmt-syntax): Narrowed down the
+        * progmodes/cc-engine.el (c-add-stmt-syntax): Narrow down the
         special case for "else if" clauses.
 
         * progmodes/cc-engine.el (c-looking-at-inexpr-block)
         (c-add-stmt-syntax): Use `c-recognize-paren-inexpr-blocks'.
 
-        * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks): New
-        language variable to recognize the gcc extension with statement
+        * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks):
+        New language variable to recognize the gcc extension with statement
         blocks inside expressions.
 
-        * progmodes/cc-engine.el (c-add-stmt-syntax): Restructured to make
+        * progmodes/cc-engine.el (c-add-stmt-syntax): Restructure to make
         it somewhat more comprehensible.  The argument AT-BLOCK-START is
         no longer used and hence removed.
 
-        (c-guess-continued-construct, c-guess-basic-syntax): Updated calls
+        (c-guess-continued-construct, c-guess-basic-syntax): Update calls
         to `c-add-stmt-syntax'.
 
-        * progmodes/cc-engine.el (c-backward-to-decl-anchor): Use
-        `c-beginning-of-statement-1' instead of duplicating parts of it.
+        * progmodes/cc-engine.el (c-backward-to-decl-anchor):
+        Use `c-beginning-of-statement-1' instead of duplicating parts of it.
         This fixes bogus label recognition.
 
         * progmodes/cc-engine.el (c-add-type, c-check-type)
-        (c-forward-name, c-forward-type): Improved storage of template
+        (c-forward-name, c-forward-type): Improve storage of template
         types in `c-found-types' so that they can be recognized better.
 
-        (c-syntactic-content): Added option to skip past nested parens.
+        (c-syntactic-content): Add option to skip past nested parens.
 
-        * progmodes/cc-engine.el (c-forward-name): Set
-        `c-last-identifier-range' all the time.  It's less work that way.
+        * progmodes/cc-engine.el (c-forward-name):
+        Set `c-last-identifier-range' all the time.  It's less work that way.
         Handle that there might not be an identifier to store in
         `c-last-identifier-range'.
 
@@ -5158,7 +5144,7 @@
         nil from `c-forward-name'.
 
         * progmodes/cc-defs.el (c-safe-scan-lists)
-        (c-(go-)?(up|down)-list-(forward|backward)): Added limit arguments.
+        (c-(go-)?(up|down)-list-(forward|backward)): Add limit arguments.
 
         * progmodes/cc-defs.el (c-save-buffer-state): Use `unwind-protect'
         to work even if the form fails.
@@ -5166,14 +5152,13 @@
         * progmodes/cc-engine.el (c-parse-state): Speedup when moving far
         down in a large file in one go.
 
-        (c-get-fallback-start-pos): New helper function for
-        `c-parse-state'.
+        (c-get-fallback-start-pos): New helper function for `c-parse-state'.
 
         * progmodes/cc-align.el (c-lineup-assignments): New lineup
         function which is like `c-lineup-math' but returns nil instead of
         `c-basic-offset' when it doesn't match.
 
-        (c-lineup-math): Changed to use `c-lineup-assignments'.
+        (c-lineup-math): Change to use `c-lineup-assignments'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -5188,7 +5173,7 @@
         places to use skip by syntax instead of skip by char class.
 
         * progmodes/cc-langs.el (c-unterminated-block-comment-regexp):
-        Fixed a bug in the regexp that caused extreme backtracking.
+        Fix a bug in the regexp that caused extreme backtracking.
 
         * progmodes/cc-langs.el (c-block-comment-starter)
         (c-block-comment-ender): New language constants to specify in a
@@ -5207,18 +5192,16 @@
 
         (c-simple-ws): New language constant for simple whitespace.
 
-        * progmodes/cc-defs.el (c-concat-separated): New convenience
-        function.
+        * progmodes/cc-defs.el (c-concat-separated): New convenience function.
 
-        * progmodes/cc-defs.el (c-make-keywords-re): Added kludge for bug
+        * progmodes/cc-defs.el (c-make-keywords-re): Add kludge for bug
         in `regexp-opt' in Emacs 20 and XEmacs when strings contain
         newlines.  Allow and ignore nil elements in the list.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el: Comment out a (n almost certainly
-        superfluous) check, (eq here (point-max)) in
-        c-beginning-of-statement.
+        superfluous) check, (eq here (point-max)) in c-beginning-of-statement.
 
         * progmodes/cc-cmds.el: Tidy up the comments in
         c-beginning-of-statement and subfunctions.
@@ -5227,8 +5210,7 @@
         more flexible c-put-char-property and c-clear-char-properties.
         Add the author's email address.
 
-        * progmodes/cc-langs.el: New variable,
-        c-block-comment-start-regexp.
+        * progmodes/cc-langs.el (c-block-comment-start-regexp): New variable.
 
         * progmodes/cc-cmds.el: Fix bug with M-e, when point is inside the
         closing "*/" of a block comment.
@@ -5252,11 +5234,11 @@
         * progmodes/cc-fonts.el (c-font-lock-invalid-string): Fix when
         there are several strings on the same line.
 
-        * progmodes/cc-engine.el (c-literal-limits): Removed the
+        * progmodes/cc-engine.el (c-literal-limits): Remove the
         compatibility function for older emacsen.  `c-literal-limits-fast'
         has now taken the place of this function.
 
-        * progmodes/cc-vars.el (c-emacs-features): Removed compatibility
+        * progmodes/cc-vars.el (c-emacs-features): Remove compatibility
         with older emacsen: We now require `pps-extended-state'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
@@ -5272,19 +5254,18 @@
         eachother.  Correct a few incidental bugs.
 
         * progmodes/cc-cmds.el: Restructure c-beginning-of-statement:
-        Improve its doc-string.  Improve the handling of certain specific
-        cases.
+        Improve its doc-string.  Improve the handling of certain specific cases.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el
-        (c-guess-basic-syntax): Changed the way class-level labels are
+        (c-guess-basic-syntax): Change the way class-level labels are
         recognized; they can now contain essentially any symbols.
 
         (c-opt-extra-label-key): New language variable to cope with the
         special protection label syntax in Objective-C.
 
-        (c-opt-access-key): Removed; this is now handled better by
+        (c-opt-access-key): Remove; this is now handled better by
         `c-nonlabel-token-key' and `c-opt-extra-label-key'.
 
         (c-complex-decl-matchers): Update to handle that
@@ -5297,11 +5278,11 @@
         Recognize bitfields better.
 
         * progmodes/cc-engine.el (c-beginning-of-inheritance-list):
-        Removed some cruft and fixed a bug that could cause it to go to a
+        Remove some cruft and fixed a bug that could cause it to go to a
         position further down.
 
         * progmodes/cc-langs.el, cc-engine.el
-        (c-beginning-of-statement-1): Improved detection of labels in
+        (c-beginning-of-statement-1): Improve detection of labels in
         declaration contexts.
 
         (c-beginning-of-decl-1): Use it.
@@ -5309,11 +5290,11 @@
         (c-nonlabel-token-key): New language constant and variable needed
         by `c-beginning-of-statement-1'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug that
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug that
         manifested itself due to the correction in `c-forward-sexp'.
 
-        * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp): Made
-        these behave as documented when used at the buffer limits.
+        * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp):
+        Make these behave as documented when used at the buffer limits.
 
         * progmodes/cc-mode.el, cc-engine.el, cc-langs.el
         (c-type-decl-end-used): Made this a language variable.
@@ -5322,20 +5303,20 @@
         correctly when `combine-after-change-calls' is used together with
         temporary narrowings.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Report
-        labels correctly when the start point is immediately after the
+        * progmodes/cc-engine.el (c-beginning-of-statement-1):
+        Report labels correctly when the start point is immediately after the
         colon.
 
-        * progmodes/cc-defs.el (c-parse-sexp-lookup-properties): Removed
-        since it isn't used anymore.
+        * progmodes/cc-defs.el (c-parse-sexp-lookup-properties):
+        Remove since it isn't used anymore.
 
         * progmodes/cc-cmds.el (c-electric-lt-gt): Detect and mark angle
         bracket arglists such as template parens in C++.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fixed a bug
+        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fix a bug
         in the last check-in.  Some optimization.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fixed bug
+        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fix bug
         where it could stop at the same level in a preceding sexp when
         PAREN-LEVEL is set.
 
@@ -5343,7 +5324,7 @@
         text property lookup only when it's needed.
 
         * progmodes/cc-langs.el, cc-engine.el, cc-fonts.el, cc-mode.el:
-        Changed the policy for paren marked angle brackets to be more
+        Change the policy for paren marked angle brackets to be more
         persistent; once marked they remain marked even when they're found
         to be unbalanced in the searched region.  This should keep the
         paren syntax around even when individual lines are refontified in
@@ -5357,7 +5338,7 @@
         (c-forward-<>-arglist, c-forward-<>-arglist-recur): The reparse
         argument has become `c-parse-and-markup-<>-arglists'.
 
-        (c-remove-<>-arglist-properties): Removed - no longer used.
+        (c-remove-<>-arglist-properties): Remove - no longer used.
 
         (c-after-change-check-<>-operators): New function used on
         `after-change-functions' to avoid that "<" and ">" characters that
@@ -5369,28 +5350,26 @@
         (c-after-change): Call `c-after-change-check-<>-operators'.
 
         (c-font-lock-<>-arglists): Use the context properties set by
-        `c-font-lock-declarations' to set
-        `c-disallow-comma-in-<>-arglists' correctly to avoid doing invalid
-        markup.
+        `c-font-lock-declarations' to set `c-disallow-comma-in-<>-arglists'
+        correctly to avoid doing invalid markup.
 
-        (c-font-lock-declarations): Removed code that undoes the invalid
+        (c-font-lock-declarations): Remove code that undoes the invalid
         markup done by `c-font-lock-<>-arglists'.
 
         (c-complex-decl-matchers): `c-font-lock-<>-arglists' now runs
         after `c-font-lock-declarations'.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Added
-        paren-level feature.
+        * progmodes/cc-engine.el (c-syntactic-skip-backward):
+        Add paren-level feature.
 
-        (c-guess-basic-syntax): Improved the anchor position for
+        (c-guess-basic-syntax): Improve the anchor position for
         `template-args-cont' in nested template arglists.  There's still
         much to be desired in this area, though.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el, cc-engine.el, cc-langs.el, cc-vars.el:
-        Make the "Text Filling and Line Breaking" commands work for AWK
-        buffers.
+        Make the "Text Filling and Line Breaking" commands work for AWK buffers.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
@@ -5429,7 +5408,7 @@
 
 2005-12-08  Kim F. Storm  <storm@cua.dk>
 
-        * emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
+        * emulation/cua-base.el (cua-use-hyper-key): Replace by ...
         (cua-rectangle-modifier-key): ... this.  New defcustom.  Can now
         select either meta, hyper, or super modifier for rectangle commands.
         (cua--rectangle-modifier-key): New defvar.
@@ -5438,8 +5417,8 @@
         on X, to meta otherwise.  Always bind C-return to toggle
         rectangle.  Pass ?\s instead of `space' to cua--M/H-key.
 
-        * emulation/cua-rect.el (cua-help-for-rectangle): Use
-        cua--rectangle-modifier-key.  Handle super modifier too.
+        * emulation/cua-rect.el (cua-help-for-rectangle):
+        Use cua--rectangle-modifier-key.  Handle super modifier too.
         (cua--init-rectangles): Always bind C-return to toggle rectangle.
         Pass ?\s instead of `space' to cua--M/H-key and cua--rect-M/H-key.
 
@@ -5450,8 +5429,8 @@
         keymap if cua--prefix-override-timer is `shift'.
         (cua--shift-control-prefix): New function; emulate "type prefix
         key twice" functionality to handle shifted prefix key override.
-        (cua--shift-control-c-prefix, cua--shift-control-x-prefix): New
-        commands.
+        (cua--shift-control-c-prefix, cua--shift-control-x-prefix):
+        New commands.
         (cua--init-keymaps): Bind them to S-C-c and S-C-x.
 
 2005-12-08  Carsten Dominik  <dominik@science.uva.nl>
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 84e0dc0cab3..0e131b665ef 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -301,7 +301,7 @@ Only applies to the current buffer."
 This function is added to `fontification-functions' when `jit-lock-mode'
 is active."
   (when (and jit-lock-mode (not memory-full))
-    (if (null jit-lock-defer-time)
+    (if (null jit-lock-defer-timer)
         ;; No deferral.
         (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
       ;; Record the buffer for later fontification.
@@ -510,7 +510,7 @@ This functions is called after Emacs has been idle for
                    (setq pos (next-single-property-change pos 'fontified)))))))))
     (setq jit-lock-defer-buffers nil)
     ;; Force fontification of the visible parts.
-    (let ((jit-lock-defer-time nil))
+    (let ((jit-lock-defer-timer nil))
       ;; (message "Jit-Defer Now")
       (sit-for 0)
       ;; (message "Jit-Defer Done")