[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111282: * lisp/net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not

[Glenn Morris]

------------------------------------------------------------
revno: 111282
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-02-19 16:21:30 -0500
message:
  * lisp/net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not
  loaded while outline-regexp is let bound.  (Bug#9584)
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-19 18:53:57 +0000
+++ b/lisp/ChangeLog    2013-02-19 21:21:30 +0000
@@ -1,3 +1,8 @@
+2013-02-19  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/python.el (python-info-current-defun): Fix failed

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-02-01 21:10:08 +0000
+++ b/lisp/net/tramp.el 2013-02-19 21:21:30 +0000
@@ -1299,6 +1299,8 @@
       (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".