From e672cad231f4be2e5456e2bf6550a8523a3c24ed Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 7 Aug 2022 14:19:19 +0200 Subject: [PATCH] ; Improve obsoletions in ediff-init.el * lisp/vc/ediff-init.el (ediff-convert-standard-filename): Convert to obsolete function alias. (ediff-device-type, ediff-last-command-char): Better document obsoletion. --- lisp/vc/ediff-init.el | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index e83a172cb84..6e0656ab4e2 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -44,9 +44,8 @@ This is provided as a temporary relief for users of face-capable displays that Ediff doesn't know about.") -;; Are we running as a window application or on a TTY? (defsubst ediff-device-type () - (declare (obsolete nil "27.1")) + (declare (obsolete window-system "27.1")) window-system) (defun ediff-window-display-p () @@ -1381,7 +1380,7 @@ This default should work without changes." (define-obsolete-function-alias 'ediff-event-key #'identity "27.1") (defun ediff-last-command-char () - (declare (obsolete nil "27.1")) + (declare (obsolete last-command-event "27.1")) last-command-event) @@ -1562,15 +1561,8 @@ This default should work without changes." (ediff-file-attributes filename 5)) -;;; Obsolete - -(defun ediff-convert-standard-filename (fname) - (declare (obsolete convert-standard-filename "28.1")) - (convert-standard-filename fname)) - -(define-obsolete-function-alias 'ediff-with-syntax-table - #'with-syntax-table "27.1") - +(define-obsolete-function-alias 'ediff-with-syntax-table #'with-syntax-table "27.1") +(define-obsolete-function-alias 'ediff-convert-standard-filename #'convert-standard-filename "28.1") (define-obsolete-function-alias 'ediff-hide-face #'ignore "28.1") (provide 'ediff-init) -- 2.39.2