# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1131522558 0
# Node ID 7049164b53da8ca37ebb1cf141dc1753f201dcb8
# Parent  3f4ee1926eb174b437e969b7882a9947ce7c04ff
*** empty log message ***

diff -r 3f4ee1926eb1 -r 7049164b53da lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Nov 09 07:48:38 2005 +0000
+++ b/lisp/ChangeLog	Wed Nov 09 07:49:18 2005 +0000
@@ -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 -r 3f4ee1926eb1 -r 7049164b53da src/ChangeLog
--- a/src/ChangeLog	Wed Nov 09 07:48:38 2005 +0000
+++ b/src/ChangeLog	Wed Nov 09 07:49:18 2005 +0000
@@ -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