2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index ce7ba81d115..eea14f2c56a 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -5885,7 +5885,8 @@ This does highlighting of signal names with specific syntax.")
       (re-search-forward "\\s-*\\<end\\s-+\\(process\\|block\\)\\>" nil t)
   )))
 
-(require 'hideshow)
+;; Not needed `hs-special-modes-alist' is autoloaded.
+;(require 'hideshow)
 
 (unless (assq 'vhdl-mode hs-special-modes-alist)
     (setq hs-special-modes-alist
diff --git a/lisp/which-func.el b/lisp/which-func.el
index 1de0ad5e5ae..56cbbbab8cd 100644
--- a/lisp/which-func.el
+++ b/lisp/which-func.el
@@ -62,6 +62,11 @@
 (defvar which-func-unknown "???"
   "String to display in the mode line when current function is unknown.")
 
+(defgroup which-func nil
+  "Mode to display the current function name in the modeline."
+  :group 'tools
+  :version "20.3")
+
 (defcustom which-func-modes 
   '(emacs-lisp-mode c-mode c++-mode perl-mode makefile-mode sh-mode)
   "List of major modes for which `which-func-mode' should be used.