Don't call c-parse-state when c++-template-syntax-table is active.

[bpt/emacs.git] / lisp / ChangeLog.15

diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 97937c8..6f71a6a 100644 (file)
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -578,6 +578,10 @@
        * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use
        `field' property of `rfn-eshadow-overlay'.
 
+2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * emacs-lisp/find-gc.el (find-gc-source-files): Remove filemode.c.
+
 2011-02-21  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * net/netrc.el (netrc-parse): Comment fix.
@@ -1416,7 +1420,6 @@
        `special-mode-map'.
        (package-menu-mode): Define using `define-derived-mode'
        inheriting from `special-mode'.
-       * erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'.
        * net/xesam.el (xesam-mode): Inherit from `special-mode'.
        (xesam-mode-map): Define separately.
        * play/solitaire.el (solitaire-mode): Inherit from `special-mode'.
@@ -2034,6 +2037,10 @@
        Don't auto-indent for indent-to-left-margin, it's too often
        counter-productive.
 
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * dired.el: Regenerate.
+
 2011-01-16  Tassilo Horn  <tassilo@member.fsf.org>
 
        * strokes.el (strokes-read-stroke): Re-fill strokes buffer with
@@ -5755,7 +5762,6 @@
        * emacs-lisp/edebug.el (edebug-eval-mode-map):
        * emacs-lisp/chart.el (chart-map):
        * edmacro.el (edmacro-mode-map):
-       * erc/erc-list.el (erc-list-menu-mode-map):
        * array.el (array-mode-map): Declare and define in one step.
 
        * vc/log-view.el (log-view-mode-map): Bind revert-buffer.
@@ -12145,7 +12151,7 @@
        (version-list-not-zero, version<, version<=, version=): Doc fix.
        (Bug#5744).
 
-2010-02-31  Dan Nicolaescu  <dann@ics.uci.edu>
+2010-03-31  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc.el (vc-root-diff): Doc fix.