diff options
| -rw-r--r-- | lib/span-extent.el | 26 | ||||
| -rw-r--r-- | lib/span-overlay.el | 15 |
2 files changed, 14 insertions, 27 deletions
diff --git a/lib/span-extent.el b/lib/span-extent.el index 52e041cc..78eb52f5 100644 --- a/lib/span-extent.el +++ b/lib/span-extent.el @@ -7,11 +7,7 @@ ;; ;; $Id$ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Bridging the emacs19/xemacs gulf ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Now define "spans" in terms of extents. +;; XEmacs-Emacs compatibility: define "spans" in terms of extents. (defsubst make-span (start end) "Make a span for the range [START, END) in current buffer." @@ -118,26 +114,22 @@ A span is before PT if it covers the character before PT." (defsubst set-span-face (span face) "set the face of a span" - (set-extent-face span face) -) + (set-extent-face span face)) -(defsubst fold-spans (FUNCTION &optional OBJECT FROM TO MAPARG FLAGS PROPERTY VALUE) +(defsubst fold-spans (function &optional object from to maparg flags property value) "map on span, see map-extent on xemacs" - (map-extents FUNCTION OBJECT FROM TO MAPARG FLAGS PROPERTY VALUE) -) + (map-extents function object from to maparg flags property value)) (defsubst set-span-properties (span plist) "see extent-properties" - (set-extent-properties span plist) -) + (set-extent-properties span plist)) -(defsubst set-span-keymap (span kmap) - (set-extent-keymap span kmap) - ) +(defsubst set-span-keymap (span map) + "Set the keymap of SPAN to MAP" + (set-extent-keymap span map)) ;there are more args to extent-at-event (defsubst span-at-event (event &optional prop) - (extent-at-event event prop) - ) + (extent-at-event event prop)) (provide 'span-extent) diff --git a/lib/span-overlay.el b/lib/span-overlay.el index 89367492..1b4402db 100644 --- a/lib/span-overlay.el +++ b/lib/span-overlay.el @@ -7,11 +7,7 @@ ;; ;; $Id$ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Bridging the emacs19/xemacs gulf ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; FIXME: NAMESPACE!!!!!!! +;; XEmacs-Emacs compatibility: define "spans" in terms of overlays. (defalias 'span-start 'overlay-start) (defalias 'span-end 'overlay-end) @@ -218,10 +214,9 @@ Behaviour is still worse than before." ;??? --Stef "set the face of a span" (overlay-put span 'face face)) -(defun set-span-keymap (span kmap) - "set the face of a span" - ;; In Emacs-20, the `keymap' does not exist, instead we could use the - ;; `local-map' property, tho it is not ideal. - (overlay-put span 'keymap kmap)) +(defun set-span-keymap (span map) + "Set the keymap of SPAN to MAP" + (overlay-put span 'keymap map) + (overlay-put span 'local-map map)) (provide 'span-overlay) |