From: Juri Linkov <juri@jurta.org>
Date: Thu, 3 Jul 2014 23:48:24 +0000 (+0300)
Subject: * lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
X-Git-Tag: emacs-24.3.93~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8abe20426b1e8e9911de1e355d82c66b8b1063aa;p=emacs.git

* lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
and `isearch-mode' associated with nil.

Fixes: debbugs:17849
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73f1f286c43..78235d76879 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-03  Juri Linkov  <juri@jurta.org>
+
+	* desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
+	and `isearch-mode' associated with nil.  (Bug#17849)
+
 2014-07-02  Juri Linkov  <juri@jurta.org>
 
 	* desktop.el (desktop-save): Rename arg `auto-save' to
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 4bb6fba3532..12207f3cdac 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -528,6 +528,8 @@ Furthermore the major mode function must be autoloaded.")
 
 (defcustom desktop-minor-mode-table
   '((auto-fill-function auto-fill-mode)
+    (defining-kbd-macro nil)
+    (isearch-mode nil)
     (vc-mode nil)
     (vc-dired-mode nil)
     (erc-track-minor-mode nil)