1 files changed, 15 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2be67ff9b92..b67ad5b7f96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,7 +6,21 @@
         (byte-compile-or): Use that.
         (byte-compile-if): Guard the else-clause too.
         (byte-compile-maybe-guarded): Handle (not (featurep 'emacs)).
-        Simplify conditions of the form (not (not BASE)).
+
+        * isearch.el (isearch-mode-end-hook-quit): New variable.
+        (isearch-done): Bind it.
+        (isearch-mode-end-hook): Doc fix.
+
+        * allout.el (allout-isearch-did-quit): Variable deleted.
+        (allout-real-isearch-abort): Function name no longer used.
+        (allout-mode): Do allout-enwrap-isearch whenever feature is wanted.
+        (allout-isearch-rectification): isearch-mode always exists.
+        Don't set allout-isearch-did-quit.
+        (allout-isearch-expose): Check isearch-mode-end-hook-error, not
+        allout-isearch-did-quit.
+        (allout-enwrap-isearch): Just add the hook.
+        (allout-isearch-abort): Function deleted.
+        (allout-pre-command-business): Avoid warning.
 
         * progmodes/pascal.el (pascal-outline-map): Use fboundp, not boundp.
         Correctly avoid warnings.