* lisp/net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not

loaded while outline-regexp is let bound.  (Bug#9584)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 390c825ad0a95be3b1f1b56f04fc79dc3a48aeea..9fe6fd4f1f988ab9c00bf5bfc17d784da686bd48 100644 (file)
--- 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 6710c8a521144f6fd45f2d38afc8084e6a621b91..e392116d1572dc099fa99dffbe015a24156de280 100644 (file)
--- 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".