[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2ac3e3eda5 3/6: Drop support for XEmacs package func-menu from id
From: |
Stefan Kangas |
Subject: |
master 2ac3e3eda5 3/6: Drop support for XEmacs package func-menu from idlwave |
Date: |
Sat, 6 Aug 2022 07:01:46 -0400 (EDT) |
branch: master
commit 2ac3e3eda5ff92b2a2c3a87755fceabf6aa1abed
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Drop support for XEmacs package func-menu from idlwave
* lisp/progmodes/idlwave.el (idlwave-function-menu): Make into
obsolete alias for imenu. Update callers.
* doc/misc/idlwave.texi (Introduction, Motion Commands): Remove
any mention of func-menu.
---
doc/misc/idlwave.texi | 7 +++----
lisp/progmodes/idlwave.el | 15 +++------------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 26a6e6c7a3..a1e6535bd8 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -217,7 +217,7 @@ Integrity checks and auto-termination of logical blocks.
@item
Routine name space conflict search with likelihood-of-use ranking.
@item
-Support for @file{imenu} (Emacs) and @file{func-menu} (XEmacs).
+Support for @file{imenu}.
@item
Documentation support.
@item
@@ -2298,12 +2298,11 @@ Regexp matching the start of a document library header.
@cindex Motion commands
@cindex Program structure, moving through
@cindex Code structure, moving through
-@cindex @file{Func-menu}, XEmacs package
-@cindex @file{Imenu}, Emacs package
+@cindex @file{Imenu}
@cindex Function definitions, jumping to
@cindex Procedure definitions, jumping to
-IDLWAVE supports both @file{Imenu} and @file{Func-menu}, two packages
+IDLWAVE supports @file{Imenu}, a package
which make it easy to jump to the definitions of functions and
procedures in the current file with a pop-up selection. To bind
@file{Imenu} to a mouse-press, use in your @file{.emacs}:
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index b3dc3cac76..b290854e1b 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -8811,7 +8811,7 @@ to reset the variable `idlwave-true-path-alist' to nil."
;; ----------------------------------------------------------------------------
;;
-;; Additions for use with imenu.el and func-menu.el
+;; Additions for use with imenu.el
;; (pop-up a list of IDL units in the current file).
;;
@@ -8835,16 +8835,7 @@ Assumes that point is at the beginning of the unit as
found by
"[a-zA-Z_][a-zA-Z0-9$_]+\\(::[a-zA-Z_][a-zA-Z0-9$_]+\\)?")
(buffer-substring-no-properties begin (point))))
-(defalias 'idlwave-function-menu
- (condition-case nil
- (progn
- (require 'func-menu)
- 'function-menu)
- (error (condition-case nil
- (progn
- (require 'imenu)
- 'imenu)
- (error nil)))))
+(define-obsolete-function-alias 'idlwave-function-menu #'imenu "29.1")
(defun idlwave-edit-in-idlde ()
"Edit the current file in IDL Development environment."
@@ -8864,7 +8855,7 @@ Assumes that point is at the beginning of the unit as
found by
;; Menus - using easymenu.el
(defvar idlwave-mode-menu-def
'("IDLWAVE"
- ["PRO/FUNC menu" idlwave-function-menu t]
+ ["PRO/FUNC menu" imenu t]
("Motion"
["Subprogram Start" idlwave-beginning-of-subprogram t]
["Subprogram End" idlwave-end-of-subprogram t]
- master updated (4be147b677 -> 3c4526028c), Stefan Kangas, 2022/08/06
- master faf231edcc 1/6: ; * lisp/gnus/mm-util.el: Remove duplicate defalias., Stefan Kangas, 2022/08/06
- master b5145fc66d 5/6: Make an rmail compat alias obsolete, Stefan Kangas, 2022/08/06
- master 543b5248db 2/6: Make face-doc-string aliases obsolete, Stefan Kangas, 2022/08/06
- master 3c4526028c 6/6: ; Maintain admin/update_autogen, Stefan Kangas, 2022/08/06
- master 2ac3e3eda5 3/6: Drop support for XEmacs package func-menu from idlwave,
Stefan Kangas <=
- master e8613adb0d 4/6: Make compat alias ede-toplevel-project-or-nil obsolete, Stefan Kangas, 2022/08/06