* progmodes/hideshow.el (hs-minor-mode-menu): Add some options to

the menu.

* vc.el (vc-deduce-fileset, vc-next-action, vc-start-entry)
(vc-finish-logentry): Check for vc-status-mode, not only for
vc-dired-mode.

1 files changed, 21 insertions, 4 deletions

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 48a32761c27..2b8e2ec0089 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -232,8 +232,6 @@
 
 ;;; Code:
 
-(require 'easymenu)
-
 ;;---------------------------------------------------------------------------
 ;; user-configurable variables
 
@@ -368,11 +366,30 @@ Use the command `hs-minor-mode' to toggle or set this variable.")
     ["Hide All"      hs-hide-all
      :help "Hide all the blocks in the buffer"]
     ["Show All"      hs-show-all
-     :help "Show all the clocks in the buffer"]
+     :help "Show all the blocks in the buffer"]
     ["Hide Level"    hs-hide-level
      :help "Hide all block at levels below the current block"]
     ["Toggle Hiding" hs-toggle-hiding
-     :help "Toggle the hiding state of the current block"]))
+     :help "Toggle the hiding state of the current block"]
+    "----"
+    ["Hide comments when hiding all" 
+     (setq hs-hide-comments-when-hiding-all
+           (not hs-hide-comments-when-hiding-all))
+     :help "If t also hide comment blocks when doing `hs-hide-all'"
+     :style toggle :selected hs-hide-comments-when-hiding-all]
+   ("Reveal on isearch"
+     ["Code blocks" (setq hs-isearch-open 'code)
+      :help "Show hidden code blocks when isearch matches inside them"
+      :active t :style radio   :selected (eq hs-isearch-open 'code)]
+     ["Comment blocks" (setq hs-isearch-open 'comment)
+      :help "Show hidden comment blocks when isearch matches inside them"
+      :active t :style radio :selected (eq hs-isearch-open 'comment)]
+     ["Code and Comment blocks" (setq hs-isearch-open t)
+      :help "Show both hidden code and comment blocks when isearch matches inside them"
+      :active t :style radio :selected (eq hs-isearch-open 'comment)]
+     ["None" (setq hs-isearch-open nil)
+      :help "Do not hidden code or comment blocks when isearch matches inside them"
+      :active t :style radio :selected (eq hs-isearch-open nil)])))
 
 (defvar hs-c-start-regexp nil
   "Regexp for beginning of comments.