ChangeLog fixes

[gnu-emacs] / lisp / ChangeLog.15

diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 4d0ff9a40e2266489167267f8bc905b8bfb11552..e6500bebd84a7550ffe1f577e636d85f2eba179e 100644 (file)
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -1416,7 +1416,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'.
@@ -5119,7 +5118,7 @@
        (x-setup-function-keys, xw-defined-colors): Merge x- and w32-
        definitions here.
 
-2010-10-24  T.V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
+2010-10-24  T. V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
 
        * net/mairix.el (mairix-searches-mode-map):
        * mail/mspools.el (mspools-mode-map): Fix 2010-10-10 change.
@@ -5755,7 +5754,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.
@@ -5790,18 +5788,18 @@
        Enhance fontification of declarators to take account of the
        presence/absence of "typedef".
 
-       * cc-engine.el (c-forward-type): New &optional param
+       * progmodes/cc-engine.el (c-forward-type): New &optional param
        "brace-block-too".
        (c-forward-decl-or-cast-1): cdr of return value now indicates the
        presence of either or both of a "struct"-like keyword and "typedef".
 
-       * cc-fonts.el (c-complex-decl-matchers): Remove the heuristic
+       * progmodes/cc-fonts.el (c-complex-decl-matchers): Remove the heuristic
        fontification of declarators which follow a "}".
        (c-font-lock-declarations): Fontify declarators according to the
        presence/absence of "typedef".
 
-       * cc-langs.el (c-typedef-kwds c-typedef-key): New lang variable
-       for "typedef".
+       * progmodes/cc-langs.el (c-typedef-kwds c-typedef-key):
+       New lang variable for "typedef".
        (c-typedef-decl-key): New lang variable built from
        c-typedef-decl-kwds.
 
@@ -18135,6 +18133,10 @@
 
        * window.el (window-full-height-p): New function.  (Bug#4543)
 
+2009-10-03  Chong Yidong  <cyd@stupidchicken.com>
+
+       * files.el (auto-mode-alist): Add .srt and Project.ede.
+
 2009-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc.el: Remove commented out code.
@@ -22792,7 +22794,7 @@ See ChangeLog.14 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2009-2013 Free Software Foundation, Inc.
+  Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.