--- a/lisp/modes/outline.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/modes/outline.el	Mon Aug 13 09:02:59 2007 +0200
@@ -172,19 +172,16 @@
 ;;; #+XEmacs
 (defun outline-install-menubar (&optional remove)
   ;; install or remove the outline menus
-  ;; This is a nop if menubars aren't available
-  (when (and (featurep 'menubar) ; XEmacs
-	     current-menubar)
-    (let ((menus (cdr outline-mode-menu)) path)
-      (and (not remove)
-	   (set-buffer-menubar (copy-sequence current-menubar)))
-      (while menus
-	(setq path (list (car (car menus))))
-	(if (and remove (find-menu-item current-menubar path))
-	    (delete-menu-item path)
-	  (or (car (find-menu-item current-menubar path))
-	      (add-menu nil (car (car menus)) (cdr (car menus)) nil)))
-	(setq menus (cdr menus))))))
+  (let ((menus (cdr outline-mode-menu)) path)
+    (and (not remove)
+	(set-buffer-menubar (copy-sequence current-menubar)))
+    (while menus
+      (setq path (list (car (car menus))))
+      (if (and remove (find-menu-item current-menubar path))
+	  (delete-menu-item path)
+	(or (car (find-menu-item current-menubar path))
+	    (add-menu nil (car (car menus)) (cdr (car menus)) nil)))
+      (setq menus (cdr menus)))))
 
 ;;;###autoload
 (defvar outline-minor-mode nil
@@ -316,12 +313,12 @@
 	(run-hooks 'outline-minor-mode-hook))
     (setq selective-display nil))
   ;; When turning off outline mode, get rid of any ^M's.
-  (unless outline-minor-mode
-    (outline-flag-region (point-min) (point-max) ?\n)
-    ;; XEmacs change
-    (set-buffer-modified-p (buffer-modified-p))
-    ;; #+XEmacs
-    (outline-install-menubar 'remove))
+  (or outline-minor-mode
+      (outline-flag-region (point-min) (point-max) ?\n))
+  ;; XEmacs change
+  (set-buffer-modified-p (buffer-modified-p))
+  ;; #+XEmacs
+  (outline-install-menubar 'remove)
   ;; XEmacs change
   (redraw-modeline))