diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-02-21 08:56:49 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-02-21 08:56:49 -0800 |
| commit | cfbf790d80eaa399afceecd9a6c3e2e76bca59b0 (patch) | |
| tree | b2c7ea684fb8d24d5f51d6959aa38854e335d9b6 /lisp/net | |
| parent | d20e6e9093f74ce2e435a3dac948df200e767405 (diff) | |
| parent | 62cfd799f17a31188b3cdb9ffbe1421b4e6cba5d (diff) | |
| download | emacs-cfbf790d80eaa399afceecd9a6c3e2e76bca59b0.tar.gz emacs-cfbf790d80eaa399afceecd9a6c3e2e76bca59b0.tar.bz2 emacs-cfbf790d80eaa399afceecd9a6c3e2e76bca59b0.zip | |
Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5305484e920..4bfe541f053 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1354,6 +1354,8 @@ The outline level is equal to the verbosity of the Tramp message." (get-buffer-create (tramp-debug-buffer-name vec)) (when (bobp) (setq buffer-undo-list t) + ;; So it does not get loaded while outline-regexp is let-bound. + (require 'outline) ;; Activate `outline-mode'. This runs `text-mode-hook' and ;; `outline-mode-hook'. We must prevent that local processes ;; die. Yes: I've seen `flyspell-mode', which starts "ispell". |