diff options
| author | Juri Linkov <juri@jurta.org> | 2014-07-04 02:48:24 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-07-04 02:48:24 +0300 |
| commit | 8abe20426b1e8e9911de1e355d82c66b8b1063aa (patch) | |
| tree | 0cccc7bc50e43eb8d69f103c2e20d5355d537e4b /lisp | |
| parent | 22c49c9acb1d68afc9f79e55a260005b5c4bf06e (diff) | |
| download | emacs-8abe20426b1e8e9911de1e355d82c66b8b1063aa.tar.gz | |
* lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
and `isearch-mode' associated with nil.
Fixes: debbugs:17849
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 7 insertions, 0 deletions
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) |