From: Barry Warsaw <barry@python.org>
Date: Fri, 15 Jan 1999 02:12:31 +0000 (+0000)
Subject: (py-electric-delete): Implement the XEmacs 21 blessed way of checking
X-Git-Tag: v1.5.2b2~331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d7b0fa9cab647e2227cefa2969ef359f959f065;p=thirdparty%2FPython%2Fcpython.git

(py-electric-delete): Implement the XEmacs 21 blessed way of checking
for delete forwardness.
---

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 48d1b612fa01..15d9f0995e33 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -1519,10 +1519,11 @@ function in `py-delete-function'.
 \\[universal-argument] (programmatically, argument ARG) specifies the
 number of characters to delete (default is 1)."
   (interactive "*p")
-  (if (and (boundp 'delete-key-deletes-forward)
-	   delete-key-deletes-forward)
+  (if (or (and (fboundp 'delete-forward-p) ;XEmacs 21
+	       (delete-forward-p))
+	  (and (boundp 'delete-key-deletes-forward) ;XEmacs 20
+	       delete-key-deletes-forward))
       (funcall py-delete-function arg)
-    ;; else
     (py-electric-backspace arg)))
 
 ;; required for pending-del and delsel modes