[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/hideshow.el
From: |
Thien-Thi Nguyen |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/hideshow.el |
Date: |
Tue, 13 Sep 2005 20:16:25 -0400 |
Index: emacs/lisp/progmodes/hideshow.el
diff -c emacs/lisp/progmodes/hideshow.el:1.55
emacs/lisp/progmodes/hideshow.el:1.56
*** emacs/lisp/progmodes/hideshow.el:1.55 Mon Aug 1 08:37:48 2005
--- emacs/lisp/progmodes/hideshow.el Wed Sep 14 00:16:25 2005
***************
*** 1,12 ****
;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! ;; 2004, 2005 Free Software Foundation
;; Author: Thien-Thi Nguyen <address@hidden>
;; Dan Nicolaescu <address@hidden>
;; Keywords: C C++ java lisp tools editing comments blocks hiding outlines
! ;; Maintainer-Version: 5.58.2.4
;; Time-of-Day-Author-Most-Likely-to-be-Recalcitrant: early morning
;; This file is part of GNU Emacs.
--- 1,12 ----
;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! ;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Thien-Thi Nguyen <address@hidden>
;; Dan Nicolaescu <address@hidden>
;; Keywords: C C++ java lisp tools editing comments blocks hiding outlines
! ;; Maintainer-Version:
;; Time-of-Day-Author-Most-Likely-to-be-Recalcitrant: early morning
;; This file is part of GNU Emacs.
***************
*** 208,218 ****
;; Thanks go to the following people for valuable ideas, code and
;; bug reports.
;;
! ;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave
! ;; Love, Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray,
! ;; Moody Ahmad, Preston F. Crow, Lars Lindberg, Reto Zimmermann,
! ;; Keith Sheffield, Chew Meng Kuan, Tony Lam, Pete Ware, François
! ;; Pinard, Stefan Monnier, Joseph Eydelnant, Michael Ernst
;;
;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using
;; overlays (rather than selective display), added isearch magic, folded
--- 208,218 ----
;; Thanks go to the following people for valuable ideas, code and
;; bug reports.
;;
! ;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave Love,
! ;; Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, Moody Ahmad,
! ;; Preston F. Crow, Lars Lindberg, Reto Zimmermann, Keith Sheffield,
! ;; Chew Meng Kuan, Tony Lam, Pete Ware, François Pinard, Stefan Monnier,
! ;; Joseph Eydelnant, Michael Ernst, Peter Heslin
;;
;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using
;; overlays (rather than selective display), added isearch magic, folded
***************
*** 587,593 ****
(while (and (< (point) q)
(> (point) p)
(not (looking-at hs-c-start-regexp)))
! (setq p (point)) ;; use this to avoid an infinite cycle
(forward-comment 1)
(skip-chars-forward " \t\n\f"))
(when (or (not (looking-at hs-c-start-regexp))
--- 587,594 ----
(while (and (< (point) q)
(> (point) p)
(not (looking-at hs-c-start-regexp)))
! ;; avoid an infinite cycle
! (setq p (point))
(forward-comment 1)
(skip-chars-forward " \t\n\f"))
(when (or (not (looking-at hs-c-start-regexp))
***************
*** 746,752 ****
(funcall hs-hide-all-non-comment-function)
(hs-hide-block-at-point t)))
;; found a comment, probably
! (let ((c-reg (hs-inside-comment-p))) ; blech!
(when (and c-reg (car c-reg))
(if (> (count-lines (car c-reg) (nth 1 c-reg)) 1)
(hs-hide-block-at-point t c-reg)
--- 747,753 ----
(funcall hs-hide-all-non-comment-function)
(hs-hide-block-at-point t)))
;; found a comment, probably
! (let ((c-reg (hs-inside-comment-p)))
(when (and c-reg (car c-reg))
(if (> (count-lines (car c-reg) (nth 1 c-reg)) 1)
(hs-hide-block-at-point t c-reg)
***************
*** 812,818 ****
(setq p (car c-reg)
q (cadr c-reg))))
((and (hs-find-block-beginning)
! (looking-at hs-block-start-regexp)) ; fresh match-data, ugh
(setq p (point)
q (progn (hs-forward-sexp (hs-match-data t) 1) (point)))))
(when (and p q)
--- 813,820 ----
(setq p (car c-reg)
q (cadr c-reg))))
((and (hs-find-block-beginning)
! ;; ugh, fresh match-data
! (looking-at hs-block-start-regexp))
(setq p (point)
q (progn (hs-forward-sexp (hs-match-data t) 1) (point)))))
(when (and p q)