Mercurial > hg > xemacs-beta
view lisp/compat.el @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 6728e641994e |
children | 2e528066e2fc |
line wrap: on
line source
;;; compat.el --- Mechanism for non-intrusively providing compatibility funs. ;; Copyright (C) 2000, 2002 Ben Wing. ;; Author: Ben Wing <ben@xemacs.org> ;; Maintainer: Ben Wing ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Authorship: ; Written May 2000 by Ben Wing. ;;; Commentary: ;; The idea is to provide emulation of API's in a namespace-clean way. Lots of packages are filled with declarations such as ;; (defalias 'gnus-overlay-get 'extent-property) ; There should be a single package to provide such compatibility code. The ; tricky part is how to do it in a clean way, without packages interfering ; with each other. ; The basic usage of compat is: ; (1) Each package copies compat.el and renames it, e.g. gnus-compat.el. ; (2) `compat' defines various API's that can be activated. To use them in a ; file, first place code like this at the top of the file: ;(let ((compat-current-package 'Gnus)) ; (require 'gnus-compat)) ; then wrap the rest of the code like this: ; (Gnus-compat-wrap '(overlays events) ;;; Commentary ;; blah ;;; Code ;(defun random-module-my-fun (bar baz) ; ... ; (overlay-put overlay 'face 'bold) ; ... ;) ; ;(defun ... ;) ; ; ; ; ;) ;; end of (Gnus-compat) ;;;; random-module.el ends here ; (3) What this does is implement the requested API's (in this case, the ; overlay API from GNU Emacs and event API from XEmacs) in whichever ; version of Emacs is running, with names such as ; `Gnus-compat-overlay-put', and then it uses `macrolet' to map the ; generic names in the wrapped code into namespace-clean names. The ; result of loading `gnus-compat' leaves around only functions beginning ; with `Gnus-compat' (or whatever prefix was specified in ; `compat-current-package'). This way, various packages, with various ; versions of `compat' as part of them, can coexist, with each package ; running the version of `compat' that it's been tested with. The use of ; `macrolet' ensures that only code that's lexically wrapped -- not code ; that's called from that code -- is affected by the API mapping. ;; Typical usage: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; 1. Wrap modules that define compatibility functions like this: ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;(compat-define-group 'fsf-compat) ;(compat-define-functions 'fsf-compat ;(defun overlay-put (overlay prop value) ; "Set property PROP to VALUE in overlay OVERLAY." ; (set-extent-property overlay prop value)) ;(defun make-overlay (beg end &optional buffer front-advance rear-advance) ; ...) ;... ;) ;; end of (compat-define-group 'fsf-compat) ;;;; overlay.el ends here ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; 2. Wrap modules that use the compatibility functions like this: ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;(let ((compat-current-package 'gnus)) ; (require 'gnus-compat)) ; ;(gnus-compat 'fsf-compat ; ;; Code: ;; ;; ;(defun random-module-my-fun (bar baz) ; ... ; (overlay-put overlay 'face 'bold) ; ... ;) ; ;(defun ... ;) ; ; ; ; ;) ;; end of (compat 'fsf-compat) ;;;; random-module.el ends here (defvar compat-current-package) (eval-when-compile (setq compat-current-package 'compat)) ;; #### not yet working '( (defmacro compat-define-compat-functions (&rest body) "Define the functions of the `compat' package in a namespace-clean way. This relies on `compat-current-package' being set. If `compat-current-package' is equal to the symbol `foo', and within BODY is something like \(defmacro compat-define-group (group) ... ) then this turns into \(defmacro foo-compat-define-group (group) ... ) and all calls are replaced accordingly. Functions such as compatibility functions in GROUP. You should simply wrap this around the code that defines the functions. Any functions and macros defined at top level using `defun' or `defmacro' will be noticed and added to GROUP. Other top-level code will be executed normally. All code and definitions in this group can safely reference any other functions in this group -- the code is effectively wrapped in a `compat' call. You can call `compat-define-functions' more than once, if necessary, for a single group. What actually happens is that the functions and macros defined here are in fact defined using names prefixed with GROUP. To use these functions, wrap any calling code with the `compat' macro, which lexically renames the function and macro calls appropriately." (let ((prefix (if (boundp 'compat-current-package) compat-current-package (error "`compat-current-package' must be defined when loading this module"))) (defs-to-munge '(defun defmacro)) mappings) (if (symbolp prefix) (setq prefix (symbol-name prefix))) ;; first, note all defuns and defmacros (let (fundef (body-tail body)) (while body-tail (setq fundef (car body-tail)) (when (and (consp fundef) (memq (car fundef) defs-to-munge)) (push (cons (second fundef) (third fundef)) mappings)) (setq body-tail (cdr body-tail)))) ;; now, munge the definitions with the new names (let (fundef (body-tail body) result defs) (while body-tail (setq fundef (car body-tail)) (push (cond ((and (consp fundef) (memq (car fundef) defs-to-munge)) (nconc (list (car fundef) (intern (concat prefix "-" (symbol-name (second fundef)))) (third fundef)) (nthcdr 3 fundef))) (t fundef)) result) (setq body-tail (cdr body-tail))) (setq result (nreverse result)) ;; now, generate the munged code, with the references to the functions ;; macroletted (mapc #'(lambda (acons) (let ((fun (car acons)) (args (cdr acons))) (push (list fun args (nconc (list 'list (list 'quote (intern (concat prefix "-" (symbol-name fun))))) args)) defs))) mappings) ;; it would be cleaner to use `lexical-let' instead of `let', but that ;; causes function definitions to have obnoxious, unreadable junk in ;; them. #### Move `lexical-let' into C!!! `(macrolet ((compat-current-package () ,compat-current-package) ,@defs) ,@result)))) (compat-define-compat-functions (defun compat-hash-table (group) (get group 'compat-table)) (defun compat-make-hash-table (group) (put group 'compat-table (make-hash-table))) (defmacro compat-define-group (group &rest body) "Define GROUP as a group of compatibility functions. This macro should wrap individual Individual functions are defined using `compat-define-functions'. Once defined, the functions can be used by wrapping your code in the `compat' macro. If GROUP is already defined, nothing happens." (let ((group (eval group))) (or (hash-table-p (compat-hash-table group)) (compat-make-hash-table group)))) (defmacro compat-clear-functions (group) "Clear all defined functions and macros out of GROUP." (let ((group (eval group))) (clrhash (compat-hash-table group)))) (defmacro compat-defun (args &rest body) (defmacro compat-define-function (props name arglist &rest body) "Define a compatibility function. PROPS are properties controlling how the function should be defined. control how the should simply wrap this around the code that defines the functions. Any functions and macros defined at top level using `defun' or `defmacro' will be noticed and added to GROUP. Other top-level code will be executed normally. All code and definitions in this group can safely reference any other functions in this group -- the code is effectively wrapped in a `compat' call. You can call `compat-define-functions' more than once, if necessary, for a single group. What actually happens is that the functions and macros defined here are in fact defined using names prefixed with GROUP. To use these functions, wrap any calling code with the `compat' macro, which lexically renames the function and macro calls appropriately." (let ((group (eval group)) (defs-to-munge '(defun defmacro)) ) (let (fundef (body-tail body)) (while body-tail (setq fundef (car body-tail)) (when (and (consp fundef) (memq (car fundef) defs-to-munge)) (puthash (second fundef) (third fundef) (compat-hash-table group))) (setq body-tail (cdr body-tail)))) (let (fundef (body-tail body) result) (while body-tail (setq fundef (car body-tail)) (push (cond ((and (consp fundef) (memq (car fundef) defs-to-munge)) (nconc (list (car fundef) (intern (concat (symbol-name group) "-" (symbol-name (second fundef)))) (third fundef)) (nthcdr 3 fundef))) (t fundef)) result) (setq body-tail (cdr body-tail))) (nconc (list 'compat-wrap (list 'quote group)) (nreverse result))))) (defvar compat-active-groups nil) (defun compat-fboundp (groups fun) "T if FUN is either `fboundp' or one of the compatibility funs in GROUPS. GROUPS is a list of compatibility groups as defined using `compat-define-group'." (or (fboundp fun) (block nil (mapcar #'(lambda (group) (if (gethash fun (compat-hash-table group)) (return t))) groups)))) (defmacro compat-wrap-runtime (groups &rest body)) (defmacro compat-wrap (groups &rest body) "Make use of compatibility functions and macros in GROUPS. GROUPS is a symbol, an API group, or list of API groups. Each API group defines a set of functions, macros, variables, etc. and that will (or should ideally) work on all recent versions of both GNU Emacs and XEmacs, and (to some extent, depending on how the functions were designed) on older version. When this function is used, it will generally not be named `compat-wrap', but have some name such as `Gnus-compat-wrap', if this is wrapping something in `gnus'. (The renaming happened when the `compat' package was loaded -- see discussion at top). To use `compat' in your package (assume your package is `gnus'), you first have to do a bit if setup. -- Copy and rename compat.el, e.g. to `gnus-compat.el'. The name must be globally unique across everything on the load path (that means all packages). -- Incude this file in your package. It will not interfere with any other versions of compat (earlier, later, etc.) provided in other packages and similarly renamed. To make use of the API's provided: -- First place code like this at the top of the file, after the copyright notices and comments: \(let ((compat-current-package 'Gnus)) (require 'gnus-compat)) -- then wrap the rest of the code like this, assuming you want access to the GNU Emacs overlays API, and the XEmacs events API: \(Gnus-compat-wrap '(overlays xem-events) ... ... ... \(defun gnus-random-fun (overlay baz) ... (overlay-put overlay 'face 'bold) ... ) ... ... \(defun gnus-random-fun-2 (event) (interactive "e") (let ((x (event-x event)) (y (event-y event))) ... ) ) ) ;; end of (Gnus-compat) ;;;; random-module.el ends here Both the requested API's will be implemented whichever version of Emacs \(GNU Emacs, XEmacs, etc.) is running, and (with limitations) on older versions as well. Furthermore, the API's are provided *ONLY* to code that's actually, lexically wrapped by `compat-wrap' (or its renamed version). All other code, including code that's called by the wrapped code, is not affected -- e.g. if we're on XEmacs, and `overlay-put' isn't normally defined, then it won't be defined in code other than the wrapped code, even if the wrapped code calls that code. Clever, huh? What happens is that the `compat-wrap' actually uses `macrolet' to inline-substitute calls to `overlay-put' to (in this case) `Gnus-compat-overlay-put', which was defined when `gnus-compat' was loaded. What happens is that is implement the requested API's (in this case, the overlay API from GNU Emacs and event API from XEmacs) in whichever version of Emacs is running, with names such as `Gnus-compat-overlay-put', and then it uses `macrolet' to map the generic names in the wrapped code into namespace-clean names. The result of loading `gnus-compat' leaves around only functions beginning with `Gnus-compat' (or whatever prefix was specified in `compat-current-package'). This way, various packages, with various versions of `compat' as part of them, can coexist, with each package running the version of `compat' that it's been tested with. The use of `macrolet' ensures that only code that's lexically wrapped -- not code that's called from that code -- is affected by the API mapping. Before using `compat' For any file where you want to make use of one or more API's provided by `compat', first do this: Wrap a call to `compat-wrap' around your entire file, like this: ;; First, you copied compat.el into your package -- we're assuming \"gnus\" -- ;; and renamed it, e.g. gnus-compat.el. Now we load it and tell it to ;; use `Gnus' as the prefix for all stuff it defines. (Use a capital letter ;; or some similar convention so that these names are not so easy to see.) \(let ((current-compat-package 'Gnus)) (require 'gnus-compat)) ;; The function `compat-wrap' was mapped to `Gnus-compat-wrap'. The idea ;; is that the raw functions beginning with `compat-' are never actually ;; defined. They may appear as function calls inside of functions, but ;; they will always be mapped to something beginning with the given prefix. \(Gnus-compat-wrap '(overlays xem-events) ... ) You should simply wrap this around the code that uses the functions and macros in GROUPS. Typically, a call to `compat' should be placed at the top of an ELisp module, with the closing parenthesis at the bottom; use this in place of a `require' statement. Wrapped code can be either function or macro definitions or other ELisp code, and wrapped function or macro definitions need not be at top level. All calls to the compatibility functions or macros will be noticed anywhere within the wrapped code. Calls to `fboundp' within the wrapped code will also behave correctly when called on compatibility functions and macros, even though they would return nil elsewhere (including in code in other modules called dynamically from the wrapped code). The functions and macros define in GROUP are actually defined under prefixed names, to avoid namespace clashes and bad interactions with other code that calls `fboundp'. All calls inside of the wrapped code to the compatibility functions and macros in GROUP are lexically mapped to the prefixed names. Since this is a lexical mapping, code in other modules that is called by functions in this module will not be affected." (let ((group (eval group)) defs) (maphash #'(lambda (fun args) (push (list fun args (nconc (list 'list (list 'quote (intern (concat (symbol-name group) "-" (symbol-name fun))))) args)) defs)) (compat-hash-table group)) ;; it would be cleaner to use `lexical-let' instead of `let', but that ;; causes function definitions to have obnoxious, unreadable junk in ;; them. #### Move `lexical-let' into C!!! `(let ((compat-active-groups (cons ',group compat-active-groups))) (macrolet ((fboundp (fun) `(compat-fboundp ',compat-active-groups ,fun)) ,@defs) ,@body)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Define the compat groups ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; overlays ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (compat-define-group 'overlays (defun-compat overlayp (object) "Return t if OBJECT is an overlay." (and (extentp object) (extent-property object 'overlay))) (defun-compat make-overlay (beg end &optional buffer front-advance rear-advance) "Create a new overlay with range BEG to END in BUFFER. If omitted, BUFFER defaults to the current buffer. BEG and END may be integers or markers. The fourth arg FRONT-ADVANCE, if non-nil, makes the front delimiter advance when text is inserted there. The fifth arg REAR-ADVANCE, if non-nil, makes the rear delimiter advance when text is inserted there." (if (null buffer) (setq buffer (current-buffer)) (check-argument-type 'bufferp buffer)) (when (> beg end) (setq beg (prog1 end (setq end beg)))) (let ((overlay (make-extent beg end buffer))) (set-extent-property overlay 'overlay t) (if front-advance (set-extent-property overlay 'start-open t) (set-extent-property overlay 'start-closed t)) (if rear-advance (set-extent-property overlay 'end-closed t) (set-extent-property overlay 'end-open t)) overlay)) (defun-compat move-overlay (overlay beg end &optional buffer) "Set the endpoints of OVERLAY to BEG and END in BUFFER. If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now. If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current buffer." (check-argument-type 'overlayp overlay) (if (null buffer) (setq buffer (extent-object overlay))) (if (null buffer) (setq buffer (current-buffer))) (check-argument-type 'bufferp buffer) (and (= beg end) (extent-property overlay 'evaporate) (delete-overlay overlay)) (when (> beg end) (setq beg (prog1 end (setq end beg)))) (set-extent-endpoints overlay beg end buffer) overlay) (defun-compat delete-overlay (overlay) "Delete the overlay OVERLAY from its buffer." (check-argument-type 'overlayp overlay) (detach-extent overlay) nil) (defun-compat overlay-start (overlay) "Return the position at which OVERLAY starts." (check-argument-type 'overlayp overlay) (extent-start-position overlay)) (defun-compat overlay-end (overlay) "Return the position at which OVERLAY ends." (check-argument-type 'overlayp overlay) (extent-end-position overlay)) (defun-compat overlay-buffer (overlay) "Return the buffer OVERLAY belongs to." (check-argument-type 'overlayp overlay) (extent-object overlay)) (defun-compat overlay-properties (overlay) "Return a list of the properties on OVERLAY. This is a copy of OVERLAY's plist; modifying its conses has no effect on OVERLAY." (check-argument-type 'overlayp overlay) (extent-properties overlay)) (defun-compat overlays-at (pos) "Return a list of the overlays that contain position POS." (overlays-in pos pos)) (defun-compat overlays-in (beg end) "Return a list of the overlays that overlap the region BEG ... END. Overlap means that at least one character is contained within the overlay and also contained within the specified region. Empty overlays are included in the result if they are located at BEG or between BEG and END." (if (featurep 'xemacs) (mapcar-extents #'identity nil nil beg end 'all-extents-closed-open 'overlay) (let ((ovls (overlay-lists)) tmp retval) (if (< end beg) (setq tmp end end beg beg tmp)) (setq ovls (nconc (car ovls) (cdr ovls))) (while ovls (setq tmp (car ovls) ovls (cdr ovls)) (if (or (and (<= (overlay-start tmp) end) (>= (overlay-start tmp) beg)) (and (<= (overlay-end tmp) end) (>= (overlay-end tmp) beg))) (setq retval (cons tmp retval)))) retval))) (defun-compat next-overlay-change (pos) "Return the next position after POS where an overlay starts or ends. If there are no more overlay boundaries after POS, return (point-max)." (let ((next (point-max)) tmp) (map-extents (lambda (overlay ignore) (when (or (and (< (setq tmp (extent-start-position overlay)) next) (> tmp pos)) (and (< (setq tmp (extent-end-position overlay)) next) (> tmp pos))) (setq next tmp)) nil) nil pos nil nil 'all-extents-closed-open 'overlay) next)) (defun-compat previous-overlay-change (pos) "Return the previous position before POS where an overlay starts or ends. If there are no more overlay boundaries before POS, return (point-min)." (let ((prev (point-min)) tmp) (map-extents (lambda (overlay ignore) (when (or (and (> (setq tmp (extent-end-position overlay)) prev) (< tmp pos)) (and (> (setq tmp (extent-start-position overlay)) prev) (< tmp pos))) (setq prev tmp)) nil) nil nil pos nil 'all-extents-closed-open 'overlay) prev)) (defun-compat overlay-lists () "Return a pair of lists giving all the overlays of the current buffer. The car has all the overlays before the overlay center; the cdr has all the overlays after the overlay center. Recentering overlays moves overlays between these lists. The lists you get are copies, so that changing them has no effect. However, the overlays you get are the real objects that the buffer uses." (or (boundp 'xemacs-internal-overlay-center-pos) (overlay-recenter (1+ (/ (- (point-max) (point-min)) 2)))) (let ((pos xemacs-internal-overlay-center-pos) before after) (map-extents (lambda (overlay ignore) (if (> pos (extent-end-position overlay)) (push overlay before) (push overlay after)) nil) nil nil nil nil 'all-extents-closed-open 'overlay) (cons (nreverse before) (nreverse after)))) (defun-compat overlay-recenter (pos) "Recenter the overlays of the current buffer around position POS." (set (make-local-variable 'xemacs-internal-overlay-center-pos) pos)) (defun-compat overlay-get (overlay prop) "Get the property of overlay OVERLAY with property name PROP." (check-argument-type 'overlayp overlay) (let ((value (extent-property overlay prop)) category) (if (and (null value) (setq category (extent-property overlay 'category))) (get category prop) value))) (defun-compat overlay-put (overlay prop value) "Set one property of overlay OVERLAY: give property PROP value VALUE." (check-argument-type 'overlayp overlay) (cond ((eq prop 'evaporate) (set-extent-property overlay 'detachable value)) ((eq prop 'before-string) (set-extent-property overlay 'begin-glyph (make-glyph (vector 'string :data value)))) ((eq prop 'after-string) (set-extent-property overlay 'end-glyph (make-glyph (vector 'string :data value)))) ((eq prop 'local-map) (set-extent-property overlay 'keymap value)) ((memq prop '(window insert-in-front-hooks insert-behind-hooks modification-hooks)) (error "cannot support overlay '%s property under XEmacs" prop))) (set-extent-property overlay prop value)) ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; extents ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defalias-compat 'delete-extent 'delete-overlay) (defalias-compat 'extent-end-position 'overlay-end) (defalias-compat 'extent-start-position 'overlay-start) (defalias-compat 'set-extent-endpoints 'move-overlay) (defalias-compat 'set-extent-property 'overlay-put) (defalias-compat 'make-extent 'make-overlay) (defun-compat extent-property (extent property &optional default) (or (overlay-get extent property) default)) (defun-compat extent-at (pos &optional object property before at-flag) (let ((tmp (overlays-at (point))) ovls) (if property (while tmp (if (extent-property (car tmp) property) (setq ovls (cons (car tmp) ovls))) (setq tmp (cdr tmp))) (setq ovls tmp tmp nil)) (car-safe (sort ovls (function (lambda (a b) (< (- (extent-end-position a) (extent-start-position a)) (- (extent-end-position b) (extent-start-position b))))))))) (defun-compat map-extents (function &optional object from to maparg flags property value) (let ((tmp (overlays-in (or from (point-min)) (or to (point-max)))) ovls) (if property (while tmp (if (extent-property (car tmp) property) (setq ovls (cons (car tmp) ovls))) (setq tmp (cdr tmp))) (setq ovls tmp tmp nil)) (catch 'done (while ovls (setq tmp (funcall function (car ovls) maparg) ovls (cdr ovls)) (if tmp (throw 'done tmp)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; extents ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; events ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ) ;; group overlays ) ;; compat-define-compat-functions (fmakunbound 'compat-define-compat-functions) )