[PATCH] Don't call #'values-list from compiled code calls under 21.4, XWEM

Hi Zajcev, I intend to commit some changes to 21.5 soon that won’t work without this change. As a bonus, the bytecode is slightly nicer under SXEmacs and XEmacs 21.4:-) . Bye, Aidan xemacs-packages/xwem/ChangeLog addition: 2009-08-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; * 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. XEmacs Packages source patch: Diff command: cvs -q diff -Nu Files affected: xemacs-packages/xwem/lisp/xwem-clients.el xemacs-packages/xwem/lisp/xwem-battery.el Index: xemacs-packages/xwem/lisp/xwem-battery.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-battery.el,v retrieving revision 1.2 diff -u -r1.2 xwem-battery.el --- xemacs-packages/xwem/lisp/xwem-battery.el 2005/04/04 19:54:10 1.2 +++ xemacs-packages/xwem/lisp/xwem-battery.el 2009/08/13 16:34:15 ＠＠ -64,6 +64,11 ＠＠ (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." Index: xemacs-packages/xwem/lisp/xwem-clients.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-clients.el,v retrieving revision 1.15 diff -u -r1.15 xwem-clients.el --- xemacs-packages/xwem/lisp/xwem-clients.el 2005/04/04 19:54:10 1.15 +++ xemacs-packages/xwem/lisp/xwem-clients.el 2009/08/13 16:34:16 ＠＠ -97,6 +97,11 ＠＠ (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) -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches