mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-20 12:18:31 +00:00
Minor XEmacs compatiblity fixes from Greg Chernev.
This commit is contained in:
parent
684d959759
commit
b97d2bcc4e
|
@ -79,7 +79,7 @@ any other entries, and any resulting duplicates will be removed entirely."
|
||||||
(make-extent beg end buffer)
|
(make-extent beg end buffer)
|
||||||
(make-overlay beg end buffer)))
|
(make-overlay beg end buffer)))
|
||||||
(defun org-delete-overlay (ovl)
|
(defun org-delete-overlay (ovl)
|
||||||
(if (featurep 'xemacs) (delete-extent ovl) (delete-overlay ovl)))
|
(if (featurep 'xemacs) (progn (delete-extent ovl) nil) (delete-overlay ovl)))
|
||||||
(defun org-detach-overlay (ovl)
|
(defun org-detach-overlay (ovl)
|
||||||
(if (featurep 'xemacs) (detach-extent ovl) (delete-overlay ovl)))
|
(if (featurep 'xemacs) (detach-extent ovl) (delete-overlay ovl)))
|
||||||
(defun org-move-overlay (ovl beg end &optional buffer)
|
(defun org-move-overlay (ovl beg end &optional buffer)
|
||||||
|
@ -123,6 +123,8 @@ any other entries, and any resulting duplicates will be removed entirely."
|
||||||
(if (featurep 'xemacs) (extent-start-position o) (overlay-start o)))
|
(if (featurep 'xemacs) (extent-start-position o) (overlay-start o)))
|
||||||
(defun org-overlay-end (o)
|
(defun org-overlay-end (o)
|
||||||
(if (featurep 'xemacs) (extent-end-position o) (overlay-end o)))
|
(if (featurep 'xemacs) (extent-end-position o) (overlay-end o)))
|
||||||
|
(defun org-overlay-buffer (o)
|
||||||
|
(if (featurep 'xemacs) (extent-buffer o) (overlay-buffer o)))
|
||||||
(defun org-find-overlays (prop &optional pos delete)
|
(defun org-find-overlays (prop &optional pos delete)
|
||||||
"Find all overlays specifying PROP at POS or point.
|
"Find all overlays specifying PROP at POS or point.
|
||||||
If DELETE is non-nil, delete all those overlays."
|
If DELETE is non-nil, delete all those overlays."
|
||||||
|
|
|
@ -138,7 +138,7 @@ We use a macro so that the test can happen at compilation time."
|
||||||
(defsubst org-match-string-no-properties (num &optional string)
|
(defsubst org-match-string-no-properties (num &optional string)
|
||||||
(if (featurep 'xemacs)
|
(if (featurep 'xemacs)
|
||||||
(let ((s (match-string num string)))
|
(let ((s (match-string num string)))
|
||||||
(remove-text-properties 0 (length s) org-rm-props s)
|
(and s (remove-text-properties 0 (length s) org-rm-props s))
|
||||||
s)
|
s)
|
||||||
(match-string-no-properties num string)))
|
(match-string-no-properties num string)))
|
||||||
|
|
||||||
|
|
12
lisp/org.el
12
lisp/org.el
|
@ -8542,10 +8542,12 @@ ACTION can be `set', `up', `down', or a character."
|
||||||
have t)
|
have t)
|
||||||
(setq current org-default-priority))
|
(setq current org-default-priority))
|
||||||
(cond
|
(cond
|
||||||
((or (eq action 'set) (integerp action))
|
((or (eq action 'set)
|
||||||
(if (integerp action)
|
(if (featurep 'xemacs) (characterp action) (integerp action)))
|
||||||
|
(if (not (eq action 'set))
|
||||||
(setq new action)
|
(setq new action)
|
||||||
(message "Priority %c-%c, SPC to remove: " org-highest-priority org-lowest-priority)
|
(message "Priority %c-%c, SPC to remove: "
|
||||||
|
org-highest-priority org-lowest-priority)
|
||||||
(setq new (read-char-exclusive)))
|
(setq new (read-char-exclusive)))
|
||||||
(if (and (= (upcase org-highest-priority) org-highest-priority)
|
(if (and (= (upcase org-highest-priority) org-highest-priority)
|
||||||
(= (upcase org-lowest-priority) org-lowest-priority))
|
(= (upcase org-lowest-priority) org-lowest-priority))
|
||||||
|
@ -11557,7 +11559,9 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]."
|
||||||
(texfile (concat texfilebase ".tex"))
|
(texfile (concat texfilebase ".tex"))
|
||||||
(dvifile (concat texfilebase ".dvi"))
|
(dvifile (concat texfilebase ".dvi"))
|
||||||
(pngfile (concat texfilebase ".png"))
|
(pngfile (concat texfilebase ".png"))
|
||||||
(fnh (face-attribute 'default :height nil))
|
(fnh (if (featurep 'xemacs)
|
||||||
|
(font-height (get-face-font 'default))
|
||||||
|
(face-attribute 'default :height nil)))
|
||||||
(scale (or (plist-get options (if buffer :scale :html-scale)) 1.0))
|
(scale (or (plist-get options (if buffer :scale :html-scale)) 1.0))
|
||||||
(dpi (number-to-string (* scale (floor (* 0.9 (if buffer fnh 140.))))))
|
(dpi (number-to-string (* scale (floor (* 0.9 (if buffer fnh 140.))))))
|
||||||
(fg (or (plist-get options (if buffer :foreground :html-foreground))
|
(fg (or (plist-get options (if buffer :foreground :html-foreground))
|
||||||
|
|
Loading…
Reference in a new issue