Commits

Anonymous committed 5f2f76b

Don't call #'values-list from compiled code calls under 21.4, XWE

Comments (0)

Files changed (3)

+2009-08-13  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lisp/xwem-battery.el:
+	* lisp/xwem-clients.el:
+	Don't call values-list from compiled code if compiling without
+	C-level multiple value support, avoiding problems when such
+	compiled code is called in an XEmacs with C-level multiple value
+	support. 
+
 2006-04-03  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.22 released.

lisp/xwem-battery.el

 
 (require 'xwem-load)
 
+;; Have compiled 21.4 code also work on XEmacs binaries with real support
+;; for multiple values, by avoiding runtime calls to #'values-list: 
+(eval-when-compile (when (eq 'identity (symbol-function 'values-list))
+                     (define-compiler-macro values-list (arg) arg)))
+
 ;;; Customisation
 (defgroup xwem-batt nil
   "Group to customise APM battery monitor."

lisp/xwem-clients.el

   (defvar xwem-frame-ev-mask)
   )
 
+;; Have compiled 21.4 code also work on XEmacs binaries with real support
+;; for multiple values, by avoiding runtime calls to #'values-list: 
+(eval-when-compile (when (eq 'identity (symbol-function 'values-list))
+                     (define-compiler-macro values-list (arg) arg)))
+
 (require 'xwem-load)
 (require 'xwem-manage)
 (require 'xwem-misc)