From: Juri Linkov <juri@jurta.org>
Date: Wed, 9 Nov 2005 07:49:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~6004
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58b6f884c020ab4edd5e8c56ea199bc3ede5d9d2;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8ec04cc786..1e2cf6cf1f5 100644
--- 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 4898a2568da..c8b4bee483b 100644
--- 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