diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-02-19 16:21:30 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-02-19 16:21:30 -0500 |
| commit | e233e1000e6982f37c196dbd6b0f654ba61ffa08 (patch) | |
| tree | d2cc88e0e29e76955d94986c06f22b81ee0a7bb8 | |
| parent | 33c0cb2549452f1ba1c1da0a1d0e45559c0be99b (diff) | |
| download | emacs-e233e1000e6982f37c196dbd6b0f654ba61ffa08.tar.gz | |
* lisp/net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not
loaded while outline-regexp is let bound. (Bug#9584)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 390c825ad0a..9fe6fd4f1f9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-02-19 Glenn Morris <rgm@gnu.org> + + * net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not + loaded while outline-regexp is let bound. (Bug#9584) + 2013-02-19 Fabián Ezequiel Gallina <fgallina@cuca> * progmodes/python.el (python-info-current-defun): Fix failed diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6710c8a5211..e392116d157 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1299,6 +1299,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". |