aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2008-01-21 19:48:56 +0000
committerMartin Rudalics2008-01-21 19:48:56 +0000
commitd405bc15fc6e676f2c6af2afd06cf7c730f0f82d (patch)
tree1741874e08ba233f4d72123e8016ebe679a982f4
parentb49fd377e88c4e6517342e2b61a6f0db2a0eab83 (diff)
downloademacs-d405bc15fc6e676f2c6af2afd06cf7c730f0f82d.tar.gz
emacs-d405bc15fc6e676f2c6af2afd06cf7c730f0f82d.zip
(outline-up-heading): Fix check for top level to
avoid infinite looping in hide-other.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/outline.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3e010f9b93..91ea02a2dbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-01-21 Martin Rudalics <rudalics@gmx.at>
2
3 * outline.el (outline-up-heading): Fix check for top level to
4 avoid infinite looping in hide-other.
5
12008-01-21 Thien-Thi Nguyen <ttn@gnuvola.org> 62008-01-21 Thien-Thi Nguyen <ttn@gnuvola.org>
2 7
3 * vc.el (vc-process-sentinel): After calling the previous 8 * vc.el (vc-process-sentinel): After calling the previous
diff --git a/lisp/outline.el b/lisp/outline.el
index f075a474810..40340e10f42 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -971,8 +971,8 @@ If INVISIBLE-OK is non-nil, also consider invisible lines."
971 (or (eq last-command 'outline-up-heading) (push-mark))) 971 (or (eq last-command 'outline-up-heading) (push-mark)))
972 (outline-back-to-heading invisible-ok) 972 (outline-back-to-heading invisible-ok)
973 (let ((start-level (funcall outline-level))) 973 (let ((start-level (funcall outline-level)))
974 (if (eq start-level 1) 974 (when (<= start-level 1)
975 (error "Already at top level of the outline")) 975 (error "Already at top level of the outline"))
976 (while (and (> start-level 1) (> arg 0) (not (bobp))) 976 (while (and (> start-level 1) (> arg 0) (not (bobp)))
977 (let ((level start-level)) 977 (let ((level start-level))
978 (while (not (or (< level start-level) (bobp))) 978 (while (not (or (< level start-level) (bobp)))