[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e672cad231 5/6: ; Improve obsoletions in ediff-init.el
From: |
Stefan Kangas |
Subject: |
master e672cad231 5/6: ; Improve obsoletions in ediff-init.el |
Date: |
Sun, 7 Aug 2022 08:52:35 -0400 (EDT) |
branch: master
commit e672cad231f4be2e5456e2bf6550a8523a3c24ed
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
; 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 e83a172cb8..6e0656ab4e 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)
- master updated (4252cea163 -> b65a2d1d99), Stefan Kangas, 2022/08/07
- master c6abfb32d7 2/6: Remove workaround for XEmacs bug in ediff-util.el, Stefan Kangas, 2022/08/07
- master e672cad231 5/6: ; Improve obsoletions in ediff-init.el,
Stefan Kangas <=
- master cf98a395d0 1/6: * lib-src/etags.c: Remove XEmacs support., Stefan Kangas, 2022/08/07
- master b65a2d1d99 6/6: Make ediff-file-remote-p obsolete in favor of file-remote-p, Stefan Kangas, 2022/08/07
- master 4439a80407 3/6: Make compat function custom-reset-variables obsolete, Stefan Kangas, 2022/08/07
- master 1f4f1358e6 4/6: Declare unused function ediff-user-grabbed-mouse obsolete, Stefan Kangas, 2022/08/07