diff options
| author | Juri Linkov | 2014-07-04 02:48:24 +0300 |
|---|---|---|
| committer | Juri Linkov | 2014-07-04 02:48:24 +0300 |
| commit | 8abe20426b1e8e9911de1e355d82c66b8b1063aa (patch) | |
| tree | 0cccc7bc50e43eb8d69f103c2e20d5355d537e4b | |
| parent | 22c49c9acb1d68afc9f79e55a260005b5c4bf06e (diff) | |
| download | emacs-8abe20426b1e8e9911de1e355d82c66b8b1063aa.tar.gz emacs-8abe20426b1e8e9911de1e355d82c66b8b1063aa.zip | |
* lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
and `isearch-mode' associated with nil.
Fixes: debbugs:17849
| -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 @@ | |||
| 1 | 2014-07-03 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro' | ||
| 4 | and `isearch-mode' associated with nil. (Bug#17849) | ||
| 5 | |||
| 1 | 2014-07-02 Juri Linkov <juri@jurta.org> | 6 | 2014-07-02 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * desktop.el (desktop-save): Rename arg `auto-save' to | 8 | * 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.") | |||
| 528 | 528 | ||
| 529 | (defcustom desktop-minor-mode-table | 529 | (defcustom desktop-minor-mode-table |
| 530 | '((auto-fill-function auto-fill-mode) | 530 | '((auto-fill-function auto-fill-mode) |
| 531 | (defining-kbd-macro nil) | ||
| 532 | (isearch-mode nil) | ||
| 531 | (vc-mode nil) | 533 | (vc-mode nil) |
| 532 | (vc-dired-mode nil) | 534 | (vc-dired-mode nil) |
| 533 | (erc-track-minor-mode nil) | 535 | (erc-track-minor-mode nil) |