Remove some XEmacs compat code from org-mode

* lisp/org/ol-eww.el (org-eww-copy-for-org-mode):
* lisp/org/ol-w3m.el (org-w3m-copy-for-org-mode):
* lisp/org/org-refile.el (org-refile):
* lisp/org/org.el (org-change-tag-in-region): Remove XEmacs compat
code.

diff --git a/lisp/org/ol-eww.el b/lisp/org/ol-eww.el
index 69bf1ba62dd151cdc1b30a234154783e723bd86a..d1bb519510711f84229052a9ae2cbf07a660f9f7 100644 (file)
--- a/lisp/org/ol-eww.el
+++ b/lisp/org/ol-eww.el
@@ -115,7 +115,7 @@ keep the structure of the Org file."
       (setq transform-start (region-beginning))
       (setq transform-end (region-end))
       ;; Deactivate mark if current mark is activate.
-      (when (fboundp 'deactivate-mark) (deactivate-mark)))
+      (deactivate-mark))
     (message "Transforming links...")
     (save-excursion
       (goto-char transform-start)

diff --git a/lisp/org/ol-w3m.el b/lisp/org/ol-w3m.el
index 517329889c61d0da464971f7ea334446b1185df7..80d6811a5c5a4f9aeeaa0acbac1336b5e953ea2d 100644 (file)
--- a/lisp/org/ol-w3m.el
+++ b/lisp/org/ol-w3m.el
@@ -72,7 +72,7 @@ so that it can be yanked into an Org  buffer with links working correctly."
       (setq transform-start (region-beginning))
       (setq transform-end (region-end))
       ;; Deactivate mark if current mark is activate.
-      (when (fboundp 'deactivate-mark) (deactivate-mark)))
+      (deactivate-mark))
     (message "Transforming links...")
     (save-excursion
       (goto-char transform-start)

diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el
index f76ebefe7b7e2f8902e80bc7adae459634761dad..71d00a7a22b42fd29df47354a6d8581915da7054 100644 (file)
--- a/lisp/org/org-refile.el
+++ b/lisp/org/org-refile.el
@@ -577,7 +577,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
                     (with-demoted-errors "Bookmark set error: %S"
                       (bookmark-set bookmark-name))))
                 (move-marker org-capture-last-stored-marker (point)))
-              (when (fboundp 'deactivate-mark) (deactivate-mark))
+               (deactivate-mark)
               (run-hooks 'org-after-refile-insert-hook)))
            (unless org-refile-keep
              (if regionp

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 1fc4251a340b356c747fd04b25e092e28d358cce..778f06aa64fb6478af161a54446edeba76aeebee 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -12160,7 +12160,7 @@ This works in the agenda, and also in an Org buffer."
         (progn
           (message "[s]et or [r]emove? ")
           (equal (read-char-exclusive) ?r))))
-  (when (fboundp 'deactivate-mark) (deactivate-mark))
+  (deactivate-mark)
   (let ((agendap (equal major-mode 'org-agenda-mode))
        l1 l2 m buf pos newhead (cnt 0))
     (goto-char end)