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

[David Kastrup]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Kastrup <dak>     06/09/15 07:19:16

Index: lispref/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lispref/ChangeLog,v
retrieving revision 1.751
retrieving revision 1.752
diff -u -b -r1.751 -r1.752
--- lispref/ChangeLog   15 Sep 2006 01:04:27 -0000      1.751
+++ lispref/ChangeLog   15 Sep 2006 07:19:15 -0000      1.752
@@ -1,3 +1,12 @@
+2006-09-15  David Kastrup  <address@hidden>
+
+       * keymaps.texi (Active Keymaps): Adapt description to use
+       `get-char-property' instead `get-text-property'.  Explain how
+       mouse events change this.  Explain the new optional argument of
+       `key-binding' and its mouse-dependent lookup.
+       (Searching Keymaps): Adapt description similarly.  Explain the new
+       optional argument of `command-remapping'.
+
 2006-09-14  Richard Stallman  <address@hidden>
 
        * keymaps.texi (Searching Keymaps): Clarification.
@@ -10,6 +19,7 @@
        (Basic Char Syntax, General Escape Syntax)
        (Ctl-Char Syntax, Meta-Char Syntax): New subnodes.
 
+>>>>>>> 1.751
 2006-09-11  Richard Stallman  <address@hidden>
 
        * display.texi (Display Table Format): Wording clarification.
@@ -4871,7 +4881,7 @@
        (info): Add target.
        (installall): Target removed.
 
-2001-10-31  Pavel Jan,Bm(Bk  <address@hidden>
+2001-10-31  Pavel Jan,Am(Bk  <address@hidden>
 
        * tips.texi (Coding Conventions): Fix typo.