branch: externals/hyperbole
commit 51ef057064107cc1fc9a76d6972ec248219fa5c5
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: GitHub <nore...@github.com>
Remove XEmacs bytecode objects compatibility (#88)
---
ChangeLog | 5 +++++
hypb.el | 17 ++---------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3717a03..4dd5ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-16 Mats Lidell <ma...@gnu.org>
+
+* hypb.el (hypb:function-copy): Remove XEmacs compatibility code for
+ bytecode objects.
+
2021-05-16 Bob Weiner <r...@gnu.org>
* hyperbole.el (hyperb:maybe-load-autoloads): Add and call from hyperb:init.
diff --git a/hypb.el b/hypb.el
index 290b251..5adcf5d 100644
--- a/hypb.el
+++ b/hypb.el
@@ -289,21 +289,8 @@ Return either the modified string or the original ARG when
not modified."
((subrp func) (error "(hypb:function-copy): `%s' is a primitive;
can't copy body"
func-symbol))
((and (hypb:emacs-byte-code-p func) (fboundp 'make-byte-code))
- (if (not (fboundp 'compiled-function-arglist))
- (let ((new-code (append func nil))) ; turn it into a list
- (apply 'make-byte-code new-code))
- ;; Can't reference bytecode objects as vectors in modern
- ;; XEmacs.
- (let ((new-code (nconc
- (list (compiled-function-arglist func)
- (compiled-function-instructions func)
- (compiled-function-constants func)
- (compiled-function-stack-depth func)
- (compiled-function-doc-string func))))
- spec)
- (when (setq spec (compiled-function-interactive func))
- (setq new-code (nconc new-code (list (nth 1 spec)))))
- (apply 'make-byte-code new-code))))
+ (let ((new-code (append func nil))) ; turn it into a list
+ (apply 'make-byte-code new-code)))
(t (error "(hypb:function-copy): Can't copy function body: %s"
func))))
(error "(hypb:function-copy): `%s' symbol is not bound to a function"
func-symbol)))
