(outline-regexp): Initialize outside the defvar.

1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/textmodes/ooutline.el b/lisp/textmodes/ooutline.el
index 3d35c224665..a9a6c959a24 100644
--- a/lisp/textmodes/ooutline.el
+++ b/lisp/textmodes/ooutline.el
@@ -34,11 +34,16 @@
 
 ;; Jan '86, Some new features added by Peter Desnoyers and rewritten by RMS.
   
-(defvar outline-regexp "[*\^l]+"
+(defvar outline-regexp nil
   "*Regular expression to match the beginning of a heading.
 Any line whose beginning matches this regexp is considered to start a heading.
 The recommended way to set this is with a Local Variables: list
 in the file it applies to.  See also outline-heading-end-regexp.")
+
+;; Can't initialize this in the defvar above -- some major modes have
+;; already assigned a local value to it.
+(or (default-value 'outline-regexp)
+    (setq-default outline-regexp "[*\^L]+"))
   
 (defvar outline-heading-end-regexp "[\n\^M]"
   "*Regular expression to match the end of a heading line.