From 20367d28f5264cd88dbb4cee821466e34355fad5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=BCdiger=20Sonderfeld?= Date: Thu, 6 Sep 2012 17:36:40 +0800 Subject: [PATCH] Fix use of obsolete variables in vhdl-mode.el. * progmodes/vhdl-mode.el (vhdl-speedbar-initialize): Don't use obsolete alias speedbar-key-map. (vhdl-doc-variable, vhdl-doc-mode): Use called-interactively-p. (vhdl-index-menu-init): Don't use obsolete variable font-lock-maximum-size. --- lisp/ChangeLog | 12 ++++++++++++ lisp/progmodes/vhdl-mode.el | 15 +++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f5f41c0e35..5a30583a9dc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2012-09-06 Chong Yidong + + * progmodes/vhdl-mode.el + +2012-09-06 Rüdiger Sonderfeld + + * progmodes/vhdl-mode.el (vhdl-speedbar-initialize): Don't use + obsolete alias speedbar-key-map. + (vhdl-doc-variable, vhdl-doc-mode): Use called-interactively-p. + (vhdl-index-menu-init): Don't use obsolete variable + font-lock-maximum-size. + 2012-09-06 Chong Yidong * frame.el (window-system-version): Mark as obsolete. diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 607ccd8b7e7..0ca3439dd60 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4138,10 +4138,7 @@ STRING are replaced by `-' and substrings are converted to lower case." (set (make-local-variable 'imenu-generic-expression) vhdl-imenu-generic-expression) (when (and vhdl-index-menu (fboundp 'imenu)) - (if (or (not (boundp 'font-lock-maximum-size)) - (> font-lock-maximum-size (buffer-size))) - (imenu-add-to-menubar "Index") - (message "Scanning buffer for index...buffer too big")))) + (imenu-add-to-menubar "Index"))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Source file menu (using `easy-menu.el') @@ -14385,10 +14382,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 @@ -17400,7 +17397,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)) @@ -17412,7 +17410,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) -- 2.39.2