[Emacs-diffs] emacs-24 r117342: * lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'

[Juri Linkov]

------------------------------------------------------------
revno: 117342
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17849
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-07-04 02:48:24 +0300
message:
  * lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
  and `isearch-mode' associated with nil.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-02 23:45:12 +0000
+++ b/lisp/ChangeLog    2014-07-03 23:48:24 +0000
@@ -1,3 +1,8 @@
+2014-07-03  Juri Linkov  <address@hidden>
+
+       * desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
+       and `isearch-mode' associated with nil.  (Bug#17849)
+
 2014-07-02  Juri Linkov  <address@hidden>
 
        * desktop.el (desktop-save): Rename arg `auto-save' to

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2014-07-02 23:45:12 +0000
+++ b/lisp/desktop.el   2014-07-03 23:48:24 +0000
@@ -528,6 +528,8 @@
 
 (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)