*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8ec04cc786431ac6e24b4b0e4dff42bebea836d..1e2cf6cf1f5a740091e955a0df8f51ee7e155ccf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09  Juri Linkov  <juri@jurta.org>
+
+       * replace.el (occur-excluded-properties): New defcustom.
+       (occur-1, occur-engine, occur-accumulate-lines): Use it.
+
 2005-11-08  Jay Belanger  <belanger@truman.edu>
 
        * calc/calc-units.el (math-convert-units): Replace any composite

diff --git a/src/ChangeLog b/src/ChangeLog
index 4898a2568daee507bcbb15778915f50b735a1d23..c8b4bee483b049731923207aabac928c0a968bc9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-09  Juri Linkov  <juri@jurta.org>
+
+       * keymap.c (shadow_lookup): If Flookup_key returns a number,
+       call it again with a sub-key-sequence, and if its return value
+       is non-nil (sub-key is bound), return nil.
+
 2005-11-08  Kim F. Storm  <storm@cua.dk>
 
        * process.c (Fsignal_process): Recognize signal names with and