[elpa] master a71a299 207/433: # Updated

[Dmitry Gutov]

branch: master
commit a71a299df606f0ec39e14987925b7d23ee4bc60e
Author: mas <mas>
Commit: mas <mas>

    # Updated
---
 ChangeLog    | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS         |  23 ++++++++++++-
 TODO         |  23 ++++++++++---
 version.texi |   2 +-
 4 files changed, 148 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5166c2..1915f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,110 @@
+2001-02-03  Michael Abraham Shulman  <address@hidden>
+
+       * mmm-mode.el, mmm-region.el, mmm-vars.el:
+       Added `mmm-primary-mode' variable so that `major-mode' can be saved.
+
+2001-01-27  Alan Shutko  <address@hidden>
+
+       * mmm.texinfo: Added direntry for automated info installation.
+
+2001-01-26  Alan Shutko  <address@hidden>
+
+       * configure.in: Use elisp macros from w3 to check for emacs and
+       lisp dir.
+
+       * aclocal.m4: Pulled elisp-related checks from the W3 library, so
+       --with-emacs= will work. 
+
+2001-01-15  Michael Abraham Shulman  <address@hidden>
+
+       * mmm-cmds.el (mmm-insert-by-key):
+       Use match-face and major-mode-preferences.
+
+       * mmm-sample.el (mmm-here-doc-get-mode):
+       Try each word individually first.
+
+       * mmm-utils.el (mmm-format-matches):
+       Removed reference to `count' variable.
+
+       * mmm-sample.el, mmm-univ.el, mmm-utils.el:
+       Allowed language names for preference lookup as "mode names".
+
+       * mmm-vars.el (mmm-set-major-mode-preferences): Added function.
+
+2001-01-14  Michael Abraham Shulman  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * mmm-sample.el, mmm-vars.el: Modified CSS to use preferred mode.
+
+       * mmm-vars.el (mmm-save-local-variables):
+       Added syntax and indentation variables for
+       cc-mode and variants.
+
+       * mmm-vars.el (mmm-major-mode-preferences):
+       Added check for `jde-mode' for Java code.
+
+2001-01-12  Michael Abraham Shulman  <address@hidden>
+
+       * mmm-auto.el: Added ePerl and JSP to autoload.
+
+2001-01-11  Michael Abraham Shulman  <address@hidden>
+
+       * mmm-sample.el: Added ePerl submode class.
+
+       * mmm-mason.el, mmm-sample.el:
+       Modified classes to use preferred mode list.
+
+       * mmm-vars.el, mmm-region.el:
+       Added alist to keep track of user-preferred major modes.
+
+       * mmm-mason.el, mmm-rpm.el, mmm-sample.el:
+       Added flags telling which faces to use for which regions.
+
+       * mmm-class.el, mmm-region.el, mmm-vars.el:
+       Added multiple faces and optional levels of decoration.
+
+2001-01-09  Michael Abraham Shulman  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * mmm-region.el (mmm-update-mode-info):
+       Hacked so `font-lock-keywords-alist' works.
+
+2001-01-05  Michael Abraham Shulman  <address@hidden>
+
+       * mmm.texinfo: Added set-background example for XEmacs.
+       Added info-dir-entry.
+
+2000-09-29  Michael Abraham Shulman  <address@hidden>
+
+       * mmm-class.el (mmm-apply-class):
+       Rearranged parameters so faces actually work.
+
+2000-09-18  Michael Abraham Shulman  <address@hidden>
+
+       * configure.in, mmm-vars.el, version.texi: Released 0.4.6
+
+2000-09-17  Michael Abraham Shulman  <address@hidden>
+
+       * FAQ: Added Q about name capitalization.
+
+2000-09-16  Michael Abraham Shulman  <address@hidden>
+
+       * mmm-compat.el (mmm-keywords-used): Added `:private'.
+
+2000-09-12  Michael Abraham Shulman  <address@hidden>
+
+       * FAQ: Added file
+
 2000-09-12  Michael Abraham Shulman  <address@hidden>
 
        * Checklist: Added comment about adding files to the distribution.
diff --git a/NEWS b/NEWS
index 0408825..cac60f9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,28 @@ MMM Mode NEWS -- history of user-visible changes.  
-*-outline-*-
 Copyright (C) 2000 Michael Abraham Shulman
 See the file COPYING for copying conditions.
 
-Please send MMM Mode bug reports to address@hidden
+Please send MMM Mode bug reports to address@hidden
+
+* Changes in MMM Mode 0.4.7
+
+** Multiple Decoration Levels
+
+You now have finer control over how colorful your submode regions are,
+via `mmm-submode-decoration-level'.  Level 0 turns coloring off--no
+messing around with faces required.  Level 1 (default) is the same as
+in previous versions.  Level 2 colors regions according to function:
+initialization, cleanup, output, declaration, comment, etc.
+
+** Preferred Major Modes
+
+The variable `mmm-major-mode-preferences' lets you tell MMM what modes
+you prefer for different programming languages and they will be used
+by all submode classes.
+
+** New Submode Classes
+
+New submode classes for JSP and ePerl are included.
+
 
 * MMM Mode 0.4.6 is a bug-fix release with one user-visible change:
 
diff --git a/TODO b/TODO
index 9abde0c..f945605 100644
--- a/TODO
+++ b/TODO
@@ -3,13 +3,26 @@ Hey Emacs, this is a -*-text-*- file!
                        To Do List for MMM Mode
                        =======================
 
+INFO FILE!!  In addition to finishing it, updating it, etc., think
+about making it less flat: turning sections into subsections, chapters
+to sections, and adding new chapters.  Also standardize punctuation to
+double spaces after sentences.
+
+Custom mode functions.
+
+Make Mason work a little better with PSGML.  The fix I've found works,
+but it would be nifty if MMM could do it automatically.  Maybe the
+custom-mode thing could set the variables, or a hook somewhere.
+
 Apostrophes mess up Perl parsing in XEmacs but not Emacs.  I thought
 it was because XEmacs sets `font-lock-beginning-of-syntax-function'
 after MMM does, but changing that that didn't fix it.
 
 Improve re-parsing current region to use inclusion/offsets/etc.
 
-Add JDE-mode, JavaSQL (see +mmm), Eperl, ASP, etc.
+Support for: ASP, PHP
+
+DEB and/or RPM packages would be nice.
 
 The local-variables improvements can probably be used to set minor
 modes locally to submode regions.  This could replace tmmofl,
@@ -26,10 +39,10 @@ start a hanging region; user option.  Don't just scan the 
inserted
 text, but backwards, using `mmm-looking-back-at'.  Remember to handle
 delimiter inclusion and offsets as best possible.
 
-It would be nice if C-j ended a Mason one-liner began a new one on the
-next line.  This is a rather Mason-specific thing, but other classes
-might have similar single-line regions.  Add a new submode class
-argument, such as KEYMAP, or even ONE-LINE?
+It would be nice if C-j ended a Mason one-liner and began a new one on
+the next line.  This is a rather Mason-specific thing, but other
+classes might have similar single-line regions.  Add a new submode
+class argument, such as KEYMAP, or even ONE-LINE?
 
 Allow a submode class to specify its allowable "parent" submode
 classes.  This could also be used to implement htp.p, by first
diff --git a/version.texi b/version.texi
index b7cfe13..88866f9 100644
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
address@hidden UPDATED 5 September 2000
address@hidden UPDATED 15 January 2001
 @set EDITION 0.4.6
 @set VERSION 0.4.6