From b7a896731c6574d9a5e4c0b33ce06a8969b5644a Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 5 Aug 2022 13:36:38 +0200 Subject: [PATCH] Make ange-ftp-re-read-dir compat alias obsolete * lisp/net/ange-ftp.el (ange-ftp-re-read-dir): Make alias obsolete. Update callers. --- lisp/gnus/nnheader.el | 4 ++-- lisp/net/ange-ftp.el | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index 92df41ea829..634cc251b87 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el @@ -920,9 +920,9 @@ first. Otherwise, find the newest one, though it may take a time." (defvar ange-ftp-path-format) (defun nnheader-re-read-dir (path) "Re-read directory PATH if PATH is on a remote system." - (when (and (fboundp 'ange-ftp-re-read-dir) (boundp 'ange-ftp-path-format)) + (when (and (fboundp 'ange-ftp-reread-dir) (boundp 'ange-ftp-path-format)) (when (string-match (car ange-ftp-path-format) path) - (ange-ftp-re-read-dir path)))) + (ange-ftp-reread-dir path)))) (defun nnheader-insert-file-contents (filename &optional visit beg end replace) "Like `insert-file-contents', q.v., but only reads in the file. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 52b900be0cc..6ffa65a2dde 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -4099,11 +4099,11 @@ E.g., ;; Put these lines uncommented in your .emacs if you want C-r to refresh ;; ange-ftp's cache whilst doing filename completion. ;; -;;(define-key minibuffer-local-completion-map "\C-r" 'ange-ftp-re-read-dir) -;;(define-key minibuffer-local-must-match-map "\C-r" 'ange-ftp-re-read-dir) +;;(define-key minibuffer-local-completion-map "\C-r" 'ange-ftp-reread-dir) +;;(define-key minibuffer-local-must-match-map "\C-r" 'ange-ftp-reread-dir) ;;;###autoload -(defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) +(define-obsolete-function-alias 'ange-ftp-re-read-dir #'ange-ftp-reread-dir "29.1") ;;;###autoload (defun ange-ftp-reread-dir (&optional dir) -- 2.39.2