[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/20 19:52:38

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14023
retrieving revision 1.14024
diff -u -b -r1.14023 -r1.14024
--- ChangeLog   20 Jun 2008 18:11:58 -0000      1.14023
+++ ChangeLog   20 Jun 2008 19:52:34 -0000      1.14024
@@ -1,5 +1,8 @@
 2008-06-20  Stefan Monnier  <address@hidden>
 
+       * progmodes/cc-mode.el (c-make-inherited-keymap): Only use
+       set-keymap-parents if set-keymap-parent doesn't exist.
+
        * vc-bzr.el (vc-bzr-annotate-extract-revision-at-line):
        Allow more than one space before the |.