[PATCH 2/2] progmodes/vhdl-mode: Fixed use of obsolete functions/variables.

[PATCH 2/2] progmodes/vhdl-mode: Fixed use of obsolete functions/variables.

[Rüdiger Sonderfeld]

(interactive-p) -> (called-interactively-p 'interactive)
speedbar-key-map -> speedbar-mode-map

Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
---
 lisp/progmodes/vhdl-mode.el |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 27215de..0b02d3d 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -14400,10 +14400,10 @@ if required."
 	  (define-key vhdl-speedbar-key-map (int-to-string key)
 	    `(lambda () (interactive) (vhdl-speedbar-set-depth ,key)))
 	  (setq key (1+ key)))))
-    (define-key speedbar-key-map "h"
+    (define-key speedbar-mode-map "h"
       (lambda () (interactive)
 	(speedbar-change-initial-expansion-list "vhdl directory")))
-    (define-key speedbar-key-map "H"
+    (define-key speedbar-mode-map "H"
       (lambda () (interactive)
 	(speedbar-change-initial-expansion-list "vhdl project")))
     ;; menu
@@ -17415,7 +17415,8 @@ to visually support naming conventions.")
   "Display VARIABLE's documentation in *Help* buffer."
   (interactive)
   (unless (featurep 'xemacs)
-    (help-setup-xref (list #'vhdl-doc-variable variable) (interactive-p)))
+    (help-setup-xref (list #'vhdl-doc-variable variable)
+                     (called-interactively-p 'interactive)))
   (with-output-to-temp-buffer
       (if (fboundp 'help-buffer) (help-buffer) "*Help*")
     (princ (documentation-property variable 'variable-documentation))
@@ -17427,7 +17428,8 @@ to visually support naming conventions.")
   "Display VHDL Mode documentation in *Help* buffer."
   (interactive)
   (unless (featurep 'xemacs)
-    (help-setup-xref (list #'vhdl-doc-mode) (interactive-p)))
+    (help-setup-xref (list #'vhdl-doc-mode)
+                     (called-interactively-p 'interactive)))
   (with-output-to-temp-buffer
       (if (fboundp 'help-buffer) (help-buffer) "*Help*")
     (princ mode-name)
-- 
1.7.10

Re: [PATCH 2/2] progmodes/vhdl-mode: Fixed use of obsolete functions/variables.

[Chong Yidong]

Rüdiger Sonderfeld <ruediger@c-plusplus.de> writes:

> (interactive-p) -> (called-interactively-p 'interactive)
> speedbar-key-map -> speedbar-mode-map
>
> Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>

Sorry for the late response; committed to trunk.