Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 mmm-mode (0.5.1-3) unstable; urgency=low
 .
   * pulled in recent changes from upstream git
Author: Alexander Zangerl <az@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- a/mmm-class.el
+++ b/mmm-class.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2000, 2004 by Michael Abraham Shulman
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 MMM Mode was originally designed and written by Michael Shulman
-<viritrilbia@users.sourceforge.net>.
+<viritrilbia@gmail.com>.
 
 It was inspired by mmm.el for XEmacs by Gongquan Chen <chen@posc.org>.
 
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,20 +51,20 @@ NOTE: This file is not kept up-to-date a
 	* mmm-vars.el (mmm-save-local-variables): Add semantic stuff and
 	c-syntactic-eol.
 
-2003-03-25  Michael A. Shulman  <viritrilbia@users.sourceforge.net>
+2003-03-25  Michael A. Shulman  <viritrilbia@gmail.com>
 
 	* mmm-mode.spec: Added file for building SRPMs, from bishop
 
 	* autogen.sh: Added file for building from CVS
 
-2003-03-22  Michael A. Shulman  <viritrilbia@users.sourceforge.net>
+2003-03-22  Michael A. Shulman  <viritrilbia@gmail.com>
 
 	* mmm-sample.el (html-php): Added new submode class.
 	(eperl): Corrected, added comment detection.
 
 	* mmm-cmds.el (mmm-insert-by-key): Added undo collapsing.
 
-2003-03-09  Michael A. Shulman  <viritrilbia@users.sourceforge.net>
+2003-03-09  Michael A. Shulman  <viritrilbia@gmail.com>
 
 	* mmm-vars.el (mmm-set-mode-line): Added support for "buffer mode"
 	display name.
@@ -89,19 +89,19 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-vars.el (mmm-delimiter-mode, mmm-delimiter-face): Added.
 
-2003-03-08  Michael A. Shulman  <viritrilbia@users.sourceforge.net>
+2003-03-08  Michael A. Shulman  <viritrilbia@gmail.com>
 
 	* mmm-region.el (mmm-clear-overlays): Fixed bug so turning mmm
 	mode off now restores primary mode correctly.
 
-2003-03-03  Michael A. Shulman  <viritrilbia@users.sourceforge.net>
+2003-03-03  Michael A. Shulman  <viritrilbia@gmail.com>
 
 	* mmm-noweb.el (mmm-noweb-bind-keys): Implemented a "local to
 	submode class" keymap binding.
 
 	* mmm-vars.el (mmm-set-mode-line): Used correct name for variable.
 
-2003-03-02  Michael A. Shulman  <viritrilbia@users.sourceforge.net>
+2003-03-02  Michael A. Shulman  <viritrilbia@gmail.com>
 
 	* mmm-mode.el (mmm-mode): Removed ancient docstring, which had
 	references to long-deprecated and removed functions.  The info
@@ -158,7 +158,7 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-cweb.el (cweb): Tweaked indentation.  Add cweb to the 
 
-2001-05-16  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-05-16  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-mode.el (mmm-mode-on): Make style variables buffer-local.
 	  Continue on all MMM errors.
@@ -169,11 +169,11 @@ NOTE: This file is not kept up-to-date a
 	* mmm-auto.el, mmm-sample.el:
 	Added `sgml-dtd' submode class from Yann Dirson <ydirson@fr.alcove.com>.
 
-2001-05-15  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-05-15  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-auto.el: Added cweb to autoloaded classes.
 
-2001-05-14  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-05-14  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-region.el: Passed arguments to `signal'.
 
@@ -187,7 +187,7 @@ NOTE: This file is not kept up-to-date a
 	(mmm-make-region): Allow nested submodes and put the priority in
 	the overlay.
 
-2001-02-23  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-02-23  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* configure.in, mmm-mode.el, mmm-vars.el, version.texi:	Released 0.4.7
 
@@ -208,7 +208,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-mason.el (mmm-mason-end-line,mmm-mason-start-line): Use bolp
 	and eolp.
 
-2001-02-03  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-02-03  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-mode.el, mmm-region.el, mmm-vars.el:
 	Added `mmm-primary-mode' variable so that `major-mode' can be saved.
@@ -225,7 +225,7 @@ NOTE: This file is not kept up-to-date a
 	* aclocal.m4: Pulled elisp-related checks from the W3 library, so
 	--with-emacs= will work. 
 
-2001-01-15  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-15  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-cmds.el (mmm-insert-by-key):
 	Use match-face and major-mode-preferences.
@@ -241,13 +241,13 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-vars.el (mmm-set-major-mode-preferences): Added function.
 
-2001-01-14  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-14  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-class.el, mmm-utils.el (mmm-format-matches):
 	Changed to allow accessing any subexp, not
 	limited by a numerical value of save-matches.
 
-2001-01-13  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-13  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-sample.el, mmm-vars.el: Modified CSS to use preferred mode.
 
@@ -258,11 +258,11 @@ NOTE: This file is not kept up-to-date a
 	* mmm-vars.el (mmm-major-mode-preferences):
 	Added check for `jde-mode' for Java code.
 
-2001-01-12  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-12  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-auto.el: Added ePerl and JSP to autoload.
 
-2001-01-11  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-11  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-sample.el: Added ePerl submode class.
 
@@ -278,44 +278,44 @@ NOTE: This file is not kept up-to-date a
 	* mmm-class.el, mmm-region.el, mmm-vars.el:
 	Added multiple faces and optional levels of decoration.
 
-2001-01-09  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-09  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-vars.el (mmm-save-local-variables):
 	Added `parse-sexp-ignore-comments', which
 	seems to fix indentation in php-mode.
 
-2001-01-08  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-08  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-region.el (mmm-update-mode-info):
 	Hacked so `font-lock-keywords-alist' works.
 
-2001-01-05  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2001-01-05  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm.texinfo: Added set-background example for XEmacs.
 	Added info-dir-entry.
 
-2000-09-29  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-29  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-class.el (mmm-apply-class):
 	Rearranged parameters so faces actually work.
 
-2000-09-18  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-18  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* configure.in, mmm-vars.el, version.texi: Released 0.4.6
 
-2000-09-17  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-17  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* FAQ: Added Q about name capitalization.
 
-2000-09-16  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-16  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-compat.el (mmm-keywords-used): Added `:private'.
 
-2000-09-12  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-12  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* FAQ: Added file
 
-2000-09-12  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-12  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* Checklist: Added comment about adding files to the distribution.
 
@@ -325,14 +325,14 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-mode.el: Created Emacs Lisp Archive Entry
 
-2000-09-05  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-09-05  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm.texinfo: Set MASON_VERSION.
 
 	* mmm-cmds.el (mmm-display-insertion-key):
 	Prevented (nthcdr -1 ...); breaks in XEmacs.
 
-2000-08-29  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-29  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-vars.el (mmm-save-local-variables): Added abbrev-mode variables.
 
@@ -342,7 +342,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-vars.el (mmm-set-file-name-for-modes):
 	Changed to a list for finer control.
 
-2000-08-24  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-24  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-region.el (mmm-make-region):
 	Explicitly set keyword defaults in &rest parameter.
@@ -350,7 +350,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-class.el (mmm-ify):
 	Explicitly set defaults for keywords in &rest parameter.
 
-2000-08-23  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-23  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-region.el, mmm-vars.el (mmm-set-buffer-file-name-p):
 	Added to control file name setting.
@@ -363,7 +363,7 @@ NOTE: This file is not kept up-to-date a
 	errors and unwanted prompts.
 	Cleared modified flag before killing leftover temporary buffers.
 
-2000-08-21  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-21  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm.texinfo:
 	Added comments on RPM Spec, File Variables, and Here-documents.
@@ -374,11 +374,11 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-rpm.el: Added file (contributed by Marcus Harnisch).
 
-2000-08-17  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-17  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-vars.el (mmm-never-modes): Added `forms-mode'.
 	
-2000-08-02  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-02  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* configure.in, mmm-vars.el, version.texi: Released 0.4.5.
 
@@ -392,7 +392,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-compat.el (mmm-set-font-lock-defaults):
 	Added compatibility wrapper function.
 
-2000-08-01  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-08-01  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* README.Mason, mmm.texinfo:
 	Added comments about `sgml-parent-document'.
@@ -402,7 +402,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-sample.el (mmm-here-doc-get-mode):
 	Extended to recognize names like TEXT_EOF.
 
-2000-07-29  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-29  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* configure.in, mmm-vars.el, version.texi: Released 0.4.4.
 
@@ -430,19 +430,19 @@ NOTE: This file is not kept up-to-date a
 	Made sure overlays get the delimiter and sticky
 	properties even if they aren't passed explicitly.
 
-2000-07-26  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-26  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* configure.in: Changed output name from `mmm' to `mmm-mode'.
 
-2000-07-24  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-24  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-sample.el: Updated file-variables class to handle prefixes.
 
-2000-07-23  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-23  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-sample.el: Wrote File Variables submode class for the new syntax.
 
-2000-07-21  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-21  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-cmds.el (mmm-ify-by-class):
 	Added completion on all defined classes.
@@ -461,7 +461,7 @@ NOTE: This file is not kept up-to-date a
 	Allowed here-documents in any mode with :match-submode.
 	Added insertion syntax to here-docs, javascript, and embperl.
 
-2000-07-14  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-14  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm.texinfo, version.texi:
 	Added MASON_VERSION variable to keep track of that.
@@ -469,7 +469,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm.texinfo: Wrote about changing key bindings and local variables.
 	Copied info from documentation of `mmm-classes-alist'.
 
-2000-07-13  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-13  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-vars.el (mmm-run-major-mode-hook):
 	Added `ignore-errors' around each call.
@@ -482,7 +482,7 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-univ.el: Limited matches to letter/dash strings that are fboundp.
 
-2000-07-12  Michael Abraham Shulman  <viritrilbia@users.sourceforge.net>
+2000-07-12  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* README.Mason: Added comment about `mmm-global-mode'.
 
@@ -731,7 +731,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-sample.el (mmm-javascript-mode): Created customization
 	variable to select mode to use for javascript regions.
 
-2000-03-26  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-26  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-cmds.el (mmm-get-insertion-spec): Insertion keys now have
 	symbolic names, although they have no definition.
@@ -742,7 +742,7 @@ NOTE: This file is not kept up-to-date a
 	interactive classes take precedence (for insertion, mainly) over
 	`mmm-classes' which overrides mode/ext classes.
 
-2000-03-24  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-24  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-vars.el (mmm-command-modifiers, mmm-insert-modifiers):
 	Switched defaults to be the way I think it should be. Users can
@@ -788,7 +788,7 @@ NOTE: This file is not kept up-to-date a
 	* mmm-class.el (mmm-apply-class, etc.): Submode classes have been
 	unified--no more 'regexp, 'region, 'group, etc.
 
-2000-03-23  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-23  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-inter.el (mmm-parse-buffer, mmm-parse-region, mmm-parse-block):
 	Added "Operating...done" messages.
@@ -806,7 +806,7 @@ NOTE: This file is not kept up-to-date a
 	properties can now be functions rather than regexps, in
 	anticipation of new future submode classes.
 
-2000-03-22  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-22  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-utils.el (mmm-valid-buffer): Renamed and added checking for
 	"never" modes.
@@ -829,7 +829,7 @@ NOTE: This file is not kept up-to-date a
 
 	* mmm-insert.el: Created file, removing code from `mmm-mode.el'.
 
-2000-03-20  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-20  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* mmm-update.el: Created file, removing code from `mmm-mode.el'.
 
@@ -852,7 +852,7 @@ NOTE: This file is not kept up-to-date a
 	* ChangeLog: Created ChangeLog file and (more or less) ported
 	existing Change Log to official format.
 
-2000-03-19  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-19  Michael Abraham Shulman  <viritrilbia@gmail.com>
 	        
 	* mmm-mode.el (mmm-global-mode): usurps and extends the role of
 	`mmm-add-find-file-hook'. Other modes can piggyback on our hack by
@@ -864,7 +864,7 @@ NOTE: This file is not kept up-to-date a
 	Added `mmm-insert-modifiers' and `mmm-command-modifiers' to
 	configure which keys do what.
 
-2000-03-18  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-18  Michael Abraham Shulman  <viritrilbia@gmail.com>
 	
 	* mmm-mode.el: Did a bunch of reorganizing. MMM-ification methods
 	are now submode classes, and what used to be called submode
@@ -887,14 +887,14 @@ NOTE: This file is not kept up-to-date a
 	added %flags, %attr, %method, and %shared tags for Mason classes.
 	These will be new in Mason version 0.82.
         
-2000-03-14  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000-03-14  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* Version 0.3.7a released.
 
 	* mmm-mode.el: Put `turn-on-font-lock-if-enabled' back in for FSF
 	  Emacs. Don't know why I thought I could take it out.
         
-2000------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+2000------  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* Version 0.3.7 released.
         
@@ -924,28 +924,28 @@ NOTE: This file is not kept up-to-date a
         
 	(mmm-ify-by-region): now checks if the region is in bounds.
         
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.6c released.
         
 	* mmm-mode.el: Added comment about putting autohandlers and
 	dhandlers in html-mode.
 
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.6b released.
         
 	* mmm-mode.el: Added comment about `psgml-mode' thanks to Michael
 	Alan Dorman.
 
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.6a released.
 
 	* mmm-mode.el: Loaded CL at compile-time to prevent execution of
 	macro arguments.
 
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.6 released.
         
@@ -955,14 +955,14 @@ NOTE: This file is not kept up-to-date a
 	  - Added user variable to control use of Perl mode vs CPerl mode.
 	Thanks to Eric A. Zarko for suggestions and testing.
 
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.5a released.
 
 	* mmm-mode.el (mmm-ify-by-all): no longer re-fontifies buffers
 	with no submodes.
 
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.5 released.
 
@@ -971,7 +971,7 @@ NOTE: This file is not kept up-to-date a
 	`mmm-beginning-of-syntax' since `font-lock-fontify-block' binds it
 	to nil for some reason.
 
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.4 released.
 
@@ -979,7 +979,7 @@ NOTE: This file is not kept up-to-date a
 	afterward, like the other interactive MMM-ification functions.
 	Updated a couple doc-strings and prompts.
         
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.3 released.
 
@@ -991,7 +991,7 @@ NOTE: This file is not kept up-to-date a
 	(mmm-parse-region): now has a key binding and doesn't refontify
 	the entire buffer.
 	
-1999------  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999------  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.2 released.
         
@@ -999,7 +999,7 @@ NOTE: This file is not kept up-to-date a
 	Fixed bug in Mason class: %def, %text, and %doc are now ignored as
 	they should be.
 
-1999-11-21  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999-11-21  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.1 released.
 
@@ -1011,7 +1011,7 @@ NOTE: This file is not kept up-to-date a
 	However, `mmm-mode-ext-classes-alist' cannot be directly modified.
 	(mmm-mode): Updated documentation to cover 0.3.x changes.
         
-1999-11-21  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999-11-21  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.3.0 released.
         
@@ -1024,13 +1024,13 @@ NOTE: This file is not kept up-to-date a
 	Allowed submode lists to contain :class keyword, so one class can
 	invoke another one, if they share submode methods.
 
-1999-11-19  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999-11-19  Michael Abraham Shulman  <viritrilbia@gmail.com>
 
 	* Version 0.2.2a released.
         
 	* mmm-mode.el: Fixed bug.
 
-1999-11-18  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999-11-18  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.2.2 released.
 
@@ -1041,14 +1041,14 @@ NOTE: This file is not kept up-to-date a
 	Added `save-match-data' calls in all searching functions.
 	Removed unnecessary auxiliary functions.
 
-1999-11-16  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999-11-16  Michael Abraham Shulman  <viritrilbia@gmail.com>
         
 	* Version 0.2.1 released.
         
 	* mmm-mode.el: Fixed font-lock absence, with-temp-message absence,
 	mmm-ifying temp buffer.
 
-1999-11-15  Michael Abraham Shulman  <viritrilbia@kurukshetra.cjb.net>
+1999-11-15  Michael Abraham Shulman  <viritrilbia@gmail.com>
 	
 	* Version 0.2.0 released to HTML::Mason mailing list.
 
--- a/mmm-cmds.el
+++ b/mmm-cmds.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2000 by Michael Abraham Shulman
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
--- a/mmm-compat.el
+++ b/mmm-compat.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2000 by Michael Abraham Shulman
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
--- a/mmm-mason.el
+++ b/mmm-mason.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2000 by Michael Abraham Shulman
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
--- a/mmm-mode.el
+++ b/mmm-mode.el
@@ -5,7 +5,7 @@
 
 ;; Emacs Lisp Archive Entry
 ;; Package: mmm-mode
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 ;; Maintainer: Dmitry Gutov <dgutov@yandex.ru>
 ;; URL: https://github.com/purcell/mmm-mode
 ;; Keywords: convenience, faces, languages, tools
@@ -123,6 +123,16 @@ submode region, the following changes \(
 4. Some local variables of the submode shadow the default mode's.
 5. Font-lock fontifies correctly for the submode.
 6. Indentation function dispatches to the appropriate submode.
+7. User-specified hooks run when the point enters or exits a submode.
+
+The user may specify a number of hooks which may run when the point
+transitions between submodes, or between the primary mode and a
+submode. When a major mode is entered, the hook mmm-x-enter-hook is
+run, where x is the name of the major mode. When a major mode is
+left, the hook mmm-y-exit-hook is run, where y is the name of the
+major mode. Users may also specify hooks with names of the form
+mmm-x-y-hook which are run when the point leaves a mode named x,
+and enters a mode named y.
 
 For further information, including installation and configuration
 instructions, see the Info file mmm.info which is included with the
--- a/mmm-region.el
+++ b/mmm-region.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000 by Michael Abraham Shulman
 ;; Copyright (C) 2012, 2013 by Dmitry Gutov
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
@@ -545,10 +545,14 @@ different keymaps, syntax tables, local
   (when (mmm-update-current-submode)
     (mmm-save-changed-local-variables mmm-previous-submode
                                       mmm-previous-overlay)
-    (let ((mode (or mmm-current-submode mmm-primary-mode)))
-      (mmm-update-mode-info mode)
-      (mmm-set-local-variables mode mmm-current-overlay)
-      (mmm-enable-font-lock mode))
+    (let ((new-mode (or mmm-current-submode mmm-primary-mode))
+          (old-mode (or mmm-previous-submode mmm-primary-mode)))
+      (mmm-run-constructed-hook old-mode new-mode)
+      (mmm-run-constructed-hook old-mode "exit")
+      (mmm-run-constructed-hook new-mode "enter")
+      (mmm-update-mode-info new-mode)
+      (mmm-set-local-variables new-mode mmm-current-overlay)
+      (mmm-enable-font-lock new-mode))
     (mmm-set-mode-line)
     (dolist (func (if mmm-current-overlay
 		      (overlay-get mmm-current-overlay 'entry-hook)
@@ -805,7 +809,10 @@ of the REGIONS covers START to STOP."
                   (save-restriction
                     (let ((font-lock-dont-widen t)
                           syntax-ppss-last syntax-ppss-cache)
-                      (when ovl (narrow-to-region beg end))
+                      ;; TODO: Remove this conditional when cc-mode
+                      ;; respects submode boundaries.
+                      (when (and ovl (not (memq mode mmm-c-derived-modes)))
+                        (narrow-to-region beg end))
                       (funcall func beg end nil)))
                   ;; Catch changes in font-lock cache.
                   (mmm-save-changed-local-variables
@@ -864,10 +871,32 @@ This will be the value of `indent-line-f
 buffer. It's supposed to delegate to the appropriate submode's
 indentation function. See `mmm-indent-line' as the starting point.")
 
+(defun mmm-indent-line-narrowed ()
+  "An indent function which works on some modes where `mmm-indent-line' doesn't.
+Works like `mmm-indent-line', but narrows the buffer before indenting to
+appease modes which rely on constructs like (point-min) to indent."
+  (interactive)
+  (funcall
+   (save-excursion
+     (back-to-indentation)
+     (mmm-update-submode-region)
+     (let ((indent-function (get
+                             (if (and mmm-current-overlay
+                                      (> (overlay-end mmm-current-overlay) (point)))
+                                 mmm-current-submode
+                               mmm-primary-mode)
+                             'mmm-indent-line-function)))
+       (if mmm-current-overlay
+           (save-restriction
+             (narrow-to-region (overlay-start mmm-current-overlay)
+                               (overlay-end mmm-current-overlay))
+             indent-function)
+         indent-function)))))
+
 (defun mmm-indent-line ()
   (interactive)
   (funcall
-    (save-excursion
+   (save-excursion
       (back-to-indentation)
       (mmm-update-submode-region)
       (get
--- a/mmm-sample.el
+++ b/mmm-sample.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2003, 2004 by Michael Abraham Shulman
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
--- a/mmm-utils.el
+++ b/mmm-utils.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2000 by Michael Abraham Shulman
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
--- a/mmm-vars.el
+++ b/mmm-vars.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000, 2004 by Michael Abraham Shulman
 ;; Copyright (C) 2012, 2013 by Dmitry Gutov
 
-;; Author: Michael Abraham Shulman <viritrilbia@users.sourceforge.net>
+;; Author: Michael Abraham Shulman <viritrilbia@gmail.com>
 
 ;;{{{ GPL
 
@@ -108,7 +108,7 @@
   '(c-mode c++-mode objc-mode pike-mode java-mode jde-mode javascript-mode
     php-mode))
 
-(defvar mmm-save-local-variables 
+(defvar mmm-save-local-variables
   `(;; Don't use `function' (#') here!!  We're already inside `quote'!
     major-mode
     comment-start
@@ -131,6 +131,7 @@
     font-lock-syntax-table
     font-lock-mark-block-function       ; Override this?
     font-lock-syntactic-keywords
+    font-lock-syntactic-face-function
     parse-sexp-ignore-comments  ; Fixes indentation in PHP-mode?
     ;; Can be different in different buffers
     (c-basic-offset
@@ -148,7 +149,8 @@
        #'(lambda (var) (list var nil mmm-c-derived-modes))
        '(c++-template-syntax-table
 	 c-<-op-cont-regexp 
-	 c->-op-cont-regexp 
+	 c->-op-cont-regexp
+         c-after-brace-list-key
 	 c-after-suffixed-type-decl-key
 	 c-after-suffixed-type-maybe-decl-key
 	 c-any-class-key
@@ -156,15 +158,18 @@
 	 c-assignment-op-regexp
 	 c-backslash-column
 	 c-basic-offset
+         c-before-context-fontification-functions
 	 c-bitfield-kwds
 	 c-block-comment-prefix
 	 c-block-decls-with-vars
          c-block-prefix-charset
+         c-block-stmt-1-2-key
 	 c-block-stmt-1-key
 	 c-block-stmt-1-kwds
 	 c-block-stmt-2-key
 	 c-block-stmt-2-kwds
-	 c-brace-list-key 
+	 c-brace-list-key
+         c-case-kwds-regexp
 	 c-cast-parens 
 	 c-class-key
 	 c-class-kwds
@@ -186,6 +191,7 @@
 	 c-expr-kwds
 	 c-file-offsets
 	 c-file-style
+         c-not-primitive-type-keywords-regexp
 	 c-hanging-braces-alist
 	 c-hanging-colons-alist
 	 c-hanging-comment-ender-p
@@ -206,14 +212,14 @@
 	 c-keywords-obarray
 	 c-keywords-regexp
 	 c-known-type-key
-	 c-label-key
-	 c-label-kwds
+         c-label-kwds
 	 c-label-kwds-regexp
 	 c-label-minimum-indentation
 	 c-lambda-kwds
 	 c-literal-start-regexp 
 	 c-macro-with-semi-re
          c-nonlabel-token-key
+         c-nonlabel-token-2-key
 	 c-nonsymbol-chars 
 	 c-nonsymbol-token-regexp
 	 c-not-decl-init-keywords
@@ -252,6 +258,7 @@
 	 c-primitive-type-key 
 	 c-primitive-type-kwds
 	 c-protection-kwds
+         c-postfix-decl-spec-key
 	 c-recognize-<>-arglists 
 	 c-recognize-knr-p
 	 c-recognize-paren-inits 
@@ -264,6 +271,7 @@
 	 c-specifier-kwds
 	 c-stmt-delim-chars 
 	 c-stmt-delim-chars-with-comma
+         c-symbol-char-key
 	 c-symbol-key
 	 c-symbol-start 
 	 c-syntactic-eol
@@ -271,7 +279,8 @@
 	 c-syntactic-ws-start 
 	 c-type-decl-prefix-key 
 	 c-type-decl-suffix-key 
-	 c-type-prefix-key 
+	 c-type-prefix-key
+         c-typeof-key
          c-prefix-spec-kwds-re
          c-typedef-key
 	 c-typedef-decl-key
