[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/hideshow.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/hideshow.el [lexbind] |
Date: |
Thu, 20 Nov 2003 19:36:41 -0500 |
Index: emacs/lisp/progmodes/hideshow.el
diff -c emacs/lisp/progmodes/hideshow.el:1.43.2.1
emacs/lisp/progmodes/hideshow.el:1.43.2.2
*** emacs/lisp/progmodes/hideshow.el:1.43.2.1 Tue Oct 14 19:30:17 2003
--- emacs/lisp/progmodes/hideshow.el Thu Nov 20 19:35:51 2003
***************
*** 395,403 ****
; (setq buffer-invisibility-spec
; (cons arg buffer-invisibility-spec)))))
; (defun remove-from-invisibility-spec (arg)
! ; (if buffer-invisibility-spec
! ; (setq buffer-invisibility-spec
! ; (delete arg buffer-invisibility-spec)))))
;; hs-match-data
(defalias 'hs-match-data 'match-data)
--- 395,403 ----
; (setq buffer-invisibility-spec
; (cons arg buffer-invisibility-spec)))))
; (defun remove-from-invisibility-spec (arg)
! ; (when buffer-invisibility-spec
! ; (setq buffer-invisibility-spec
! ; (delete arg buffer-invisibility-spec)))))
;; hs-match-data
(defalias 'hs-match-data 'match-data)
***************
*** 497,525 ****
and then further adjusted to be at the end of the line."
(if comment-reg
(hs-hide-comment-region (car comment-reg) (cadr comment-reg) end)
! (if (looking-at hs-block-start-regexp)
! (let* ((mdata (hs-match-data t))
! (pure-p (match-end 0))
! (p
! ;; `p' is the point at the end of the block beginning,
! ;; which may need to be adjusted
! (save-excursion
! (goto-char (funcall (or hs-adjust-block-beginning
! 'identity)
! pure-p))
! ;; whatever the adjustment, we move to eol
! (end-of-line)
! (point)))
! (q
! ;; `q' is the point at the end of the block
! (progn (hs-forward-sexp mdata 1)
! (end-of-line)
! (point))))
! (if (and (< p (point)) (> (count-lines p q) 1))
! (overlay-put (hs-flag-region p q 'code)
! 'hs-ofs
! (- pure-p p)))
! (goto-char (if end q (min p pure-p)))))))
(defun hs-safety-is-job-n ()
"Warn if `buffer-invisibility-spec' does not contain symbol `hs'."
--- 497,525 ----
and then further adjusted to be at the end of the line."
(if comment-reg
(hs-hide-comment-region (car comment-reg) (cadr comment-reg) end)
! (when (looking-at hs-block-start-regexp)
! (let* ((mdata (hs-match-data t))
! (pure-p (match-end 0))
! (p
! ;; `p' is the point at the end of the block beginning,
! ;; which may need to be adjusted
! (save-excursion
! (goto-char (funcall (or hs-adjust-block-beginning
! 'identity)
! pure-p))
! ;; whatever the adjustment, we move to eol
! (end-of-line)
! (point)))
! (q
! ;; `q' is the point at the end of the block
! (progn (hs-forward-sexp mdata 1)
! (end-of-line)
! (point))))
! (when (and (< p (point)) (> (count-lines p q) 1))
! (overlay-put (hs-flag-region p q 'code)
! 'hs-ofs
! (- pure-p p)))
! (goto-char (if end q (min p pure-p)))))))
(defun hs-safety-is-job-n ()
"Warn if `buffer-invisibility-spec' does not contain symbol `hs'."
***************
*** 568,583 ****
(setq p (point));; use this to avoid an infinite cycle
(forward-comment 1)
(skip-chars-forward " \t\n\f"))
! (if (or (not (looking-at hs-c-start-regexp))
! (> (point) q))
! ;; we cannot hide this comment block
! (setq not-hidable t)))
;; goto the end of the comment
(forward-comment (buffer-size))
(skip-chars-backward " \t\n\f")
(end-of-line)
! (if (>= (point) q)
! (list (if not-hidable nil p) (point))))))))
(defun hs-grok-mode-type ()
"Set up hideshow variables for new buffers.
--- 568,583 ----
(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))
! (> (point) q))
! ;; we cannot hide this comment block
! (setq not-hidable t)))
;; goto the end of the comment
(forward-comment (buffer-size))
(skip-chars-backward " \t\n\f")
(end-of-line)
! (when (>= (point) q)
! (list (if not-hidable nil p) (point))))))))
(defun hs-grok-mode-type ()
"Set up hideshow variables for new buffers.
***************
*** 607,615 ****
c-start-regexp)))
hs-forward-sexp-func (or (nth 4 lookup) 'forward-sexp)
hs-adjust-block-beginning (nth 5 lookup)))
! (progn
! (setq hs-minor-mode nil)
! (error "%s Mode doesn't support Hideshow Minor Mode" mode-name))))
(defun hs-find-block-beginning ()
"Reposition point at block-start.
--- 607,614 ----
c-start-regexp)))
hs-forward-sexp-func (or (nth 4 lookup) 'forward-sexp)
hs-adjust-block-beginning (nth 5 lookup)))
! (setq hs-minor-mode nil)
! (error "%s Mode doesn't support Hideshow Minor Mode" mode-name)))
(defun hs-find-block-beginning ()
"Reposition point at block-start.
***************
*** 667,677 ****
(if (and c-reg (nth 0 c-reg))
;; point is inside a comment, and that comment is hidable
(goto-char (nth 0 c-reg))
! (if (and (not c-reg)
! (hs-find-block-beginning)
! (looking-at hs-block-start-regexp))
! ;; point is inside a block
! (goto-char (match-end 0)))))
(end-of-line)
(let ((overlays (overlays-at (point)))
(found nil))
--- 666,676 ----
(if (and c-reg (nth 0 c-reg))
;; point is inside a comment, and that comment is hidable
(goto-char (nth 0 c-reg))
! (when (and (not c-reg)
! (hs-find-block-beginning)
! (looking-at hs-block-start-regexp))
! ;; point is inside a block
! (goto-char (match-end 0)))))
(end-of-line)
(let ((overlays (overlays-at (point)))
(found nil))
***************
*** 888,895 ****
;; load-time actions
;; keymaps and menus
! (if hs-minor-mode-map
! nil
(setq hs-minor-mode-map (make-sparse-keymap))
(easy-menu-define hs-minor-mode-menu
hs-minor-mode-map
--- 887,893 ----
;; load-time actions
;; keymaps and menus
! (unless hs-minor-mode-map
(setq hs-minor-mode-map (make-sparse-keymap))
(easy-menu-define hs-minor-mode-menu
hs-minor-mode-map
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/hideshow.el [lexbind],
Miles Bader <=