2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d69b3000eae..13b8eab1b31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-30  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * outline.el (outline-font-lock-levels): Comment out unused var.
+        (outline-font-lock-face): Wrap around face list to handle any
+        nesting depth gracefully.
+
 2007-08-30  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/ange-ftp.el: Add ange-ftp property to 'set-file-modes and
diff --git a/lisp/outline.el b/lisp/outline.el
index 6eabd8f3d02..294de86ec25 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -215,8 +215,8 @@ in the file it applies to."
   [outline-1 outline-2 outline-3 outline-4
    outline-5 outline-6 outline-7 outline-8])
 
-(defvar outline-font-lock-levels nil)
-(make-variable-buffer-local 'outline-font-lock-levels)
+;; (defvar outline-font-lock-levels nil)
+;; (make-variable-buffer-local 'outline-font-lock-levels)
 
 (defun outline-font-lock-face ()
   ;; (save-excursion
@@ -241,9 +241,7 @@ in the file it applies to."
   (save-excursion
     (goto-char (match-beginning 0))
     (looking-at outline-regexp)
-    (condition-case nil
-        (aref outline-font-lock-faces (1- (funcall outline-level)))
-      (error font-lock-warning-face))))
+    (aref outline-font-lock-faces (% (1- (funcall outline-level)) (length outline-font-lock-faces)))))
 
 (defvar outline-view-change-hook nil
   "Normal hook to be run after outline visibility changes.")