mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

(hs-hide-all): Don't infloop on comments that start in the middle of the line.

Browse Source 
Fixes: debbugs:10496
This commit is contained in:
Sébastien Gross 2012-04-11 01:34:25 +02:00 committed by Lars Magne Ingebrigtsen
parent 6a8c9eafb9
commit 43956923c0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-10 Sébastien Gross <seb@chezwam.org> (tiny change)
* progmodes/hideshow.el (hs-hide-all): Don't infloop on comments
that start in the middle of the line (bug#10496).
2012-04-10 Dan Nicolaescu <dann@gnu.org>
* battery.el (battery-linux-proc-acpi): Only one battery is

11
lisp/progmodes/hideshow.el
View File

@ -802,12 +802,15 @@ If `hs-hide-comments-when-hiding-all' is non-nil, also hide the comments."
(forward-comment (point-max)))
(re-search-forward re (point-max) t))
(if (match-beginning 1)
;; we have found a block beginning
;; We have found a block beginning.
(progn
(goto-char (match-beginning 1))
(if hs-hide-all-non-comment-function
(funcall hs-hide-all-non-comment-function)
(hs-hide-block-at-point t)))
(unless (if hs-hide-all-non-comment-function
(funcall hs-hide-all-non-comment-function)
(hs-hide-block-at-point t))
;; Go to end of matched data to prevent from getting stuck
;; with an endless loop.
(goto-char (match-end 0))))
;; found a comment, probably
(let ((c-reg (hs-inside-comment-p)))
(when (and c-reg (car c-reg))