From 183d2c3e5463d33af05e5ea8ea546bd348da0d10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Harald=20J=C3=B6rg?= Date: Mon, 13 Nov 2023 16:39:20 +0100 Subject: [PATCH] ; cperl-mode.el: Eliminate warnings about using obsolete functions * lisp/progmodes/cperl-mode.el (cperl-info-on-current-command): Use cperl-perldoc instead of cperl-info-on-command. (cperl-imenu-on-info): Shortcut this function since the Perl info file can no longer be installed. --- lisp/progmodes/cperl-mode.el | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 5b3395b77d2..ab624a08646 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -6641,7 +6641,7 @@ side-effect of memorizing only. Examples in `cperl-style-examples'." (defun cperl-info-on-current-command () (declare (obsolete cperl-perldoc "30.1")) (interactive) - (cperl-info-on-command (cperl-word-at-point))) + (cperl-perldoc (cperl-word-at-point))) (defun cperl-imenu-info-imenu-search () (declare (obsolete nil "30.1")) @@ -6660,32 +6660,9 @@ side-effect of memorizing only. Examples in `cperl-style-examples'." (defun cperl-imenu-on-info () (declare (obsolete nil "30.1")) (interactive) - (require 'imenu) - (let* ((buffer (current-buffer)) - imenu-create-index-function - imenu-prev-index-position-function - imenu-extract-index-name-function - (index-item (save-restriction - (save-window-excursion - (set-buffer (cperl-info-buffer nil)) - (setq imenu-create-index-function - 'imenu-default-create-index-function - imenu-prev-index-position-function - #'cperl-imenu-info-imenu-search - imenu-extract-index-name-function - #'cperl-imenu-info-imenu-name) - (imenu-choose-buffer-index))))) - (and index-item - (progn - (push-mark) - (pop-to-buffer "*info-perl*") - (cond - ((markerp (cdr index-item)) - (goto-char (marker-position (cdr index-item)))) - (t - (goto-char (cdr index-item)))) - (set-window-start (selected-window) (point)) - (pop-to-buffer buffer))))) + (message + (concat "The info file `perl' is no longer available.\n" + "Consider installing the perl-doc package from GNU ELPA."))) (defun cperl-lineup (beg end &optional step minshift) "Lineup construction in a region. -- 2.39.2