* 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 73f1f286c43cea54cad570020823769a6ee0bf14..78235d768797a7b41ab9cdc4b70fe2180abe44df 100644 (file)
--- 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 4bb6fba3532018eeba89c69b13cd5fdee3c615a6..12207f3cdac18599cef5d5c3ae3dd7405563a179 100644 (file)
--- 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)