Commit 1a8e83dc authored by Thien-Thi Nguyen's avatar Thien-Thi Nguyen
Browse files

(hs-minor-mode-menu): Fix omission bug; was used but not declared.

(hs-discard-overlays, hs-isearch-show, hs-isearch-show-temporary,
hs-find-block-beginning): Add or modify docstrings.

(hs-isearch-show): Rewrite.
parent 1c89844b
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
;; * Commands provided ;; * Commands provided
;; ;;
;; This file provides `hs-minor-mode'. When active, eight commands are ;; This file provides Hideshow Minor Mode. When active, eight commands
;; available, implementing block hiding and showing. They (and their ;; are available, implementing block hiding and showing. They (and their
;; keybindings) are: ;; keybindings) are:
;; ;;
;; hs-hide-block C-c h ;; hs-hide-block C-c h
...@@ -254,6 +254,9 @@ Use the command `hs-minor-mode' to toggle or set this variable.") ...@@ -254,6 +254,9 @@ Use the command `hs-minor-mode' to toggle or set this variable.")
(defvar hs-minor-mode-map nil (defvar hs-minor-mode-map nil
"Keymap for hideshow minor mode.") "Keymap for hideshow minor mode.")
(defvar hs-minor-mode-menu nil
"Menu for hideshow minor mode.")
(defvar hs-c-start-regexp nil (defvar hs-c-start-regexp nil
"Regexp for beginning of comments. "Regexp for beginning of comments.
Differs from mode-specific comment regexps in that Differs from mode-specific comment regexps in that
...@@ -340,6 +343,7 @@ Note that `mode-line-format' is buffer-local.") ...@@ -340,6 +343,7 @@ Note that `mode-line-format' is buffer-local.")
;; support functions ;; support functions
(defun hs-discard-overlays (from to) (defun hs-discard-overlays (from to)
"Delete hideshow overlays in region defined by FROM and TO."
(when (< to from) (when (< to from)
(setq from (prog1 to (setq to from)))) (setq from (prog1 to (setq to from))))
(mapcar (lambda (ov) (mapcar (lambda (ov)
...@@ -348,10 +352,21 @@ Note that `mode-line-format' is buffer-local.") ...@@ -348,10 +352,21 @@ Note that `mode-line-format' is buffer-local.")
(overlays-in from to))) (overlays-in from to)))
(defun hs-isearch-show (ov) (defun hs-isearch-show (ov)
"Delete overlay OV, and set `hs-headline' to nil.
This function is meant to be used as the `isearch-open-invisible'
property of an overlay."
(setq hs-headline nil) (setq hs-headline nil)
(hs-flag-region (overlay-start ov) (overlay-end ov) nil)) (delete-overlay ov))
(defun hs-isearch-show-temporary (ov hide-p) (defun hs-isearch-show-temporary (ov hide-p)
"Hide or show overlay OV, and set `hs-headline', all depending on HIDE-P.
If HIDE-P is non-nil, `hs-headline' is set to nil and overlay OV is hidden.
Otherwise, `hs-headline' is set to the line of text at the head of OV, and
OV is shown.
This function is meant to be used as the `isearch-open-invisible-temporary'
property of an overlay."
(setq hs-headline (setq hs-headline
(if hide-p (if hide-p
nil nil
...@@ -531,7 +546,7 @@ function; and adjust-block-beginning function." ...@@ -531,7 +546,7 @@ function; and adjust-block-beginning function."
(defun hs-find-block-beginning () (defun hs-find-block-beginning ()
"Reposition point at block-start. "Reposition point at block-start.
Return point, or nil if top-level." Return point, or nil if original point was not in a block."
(let ((done nil) (let ((done nil)
(here (point))) (here (point)))
;; look if current line is block start ;; look if current line is block start
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment