diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-07-08 19:04:12 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-07-08 19:04:12 -0700 |
| commit | 5613a6f6d52bca0018c5777aba67a99f51016a35 (patch) | |
| tree | c070100c79442ae2f9876f82af4eeebadc39249c /lisp/desktop.el | |
| parent | 27e81f9f4e368176a3b17ceeadd2e0aa5dd9d1ed (diff) | |
| parent | d8899d09b992d733dc1cc6ec93b11cb75ce84f5d (diff) | |
| download | emacs-5613a6f6d52bca0018c5777aba67a99f51016a35.tar.gz | |
Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 2 |
1 files changed, 2 insertions, 0 deletions
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) |