bug#36189: [PATCH] Remove XEmacs support from bookmark.el

[Stefan Kangas <stefan@marxist.se>]

[-- Attachment #1: Type: text/plain, Size: 69 bytes --]

This removes XEmacs support from bookmark.el.

Thanks,
Stefan Kangas

[-- Attachment #2: 0001-Remove-XEmacs-support-from-bookmark.el.patch --]
[-- Type: application/octet-stream, Size: 1063 bytes --]

From 77d721a8c0c2bca139ed0b4144060f5965997689 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 13 Jun 2019 14:25:58 +0200
Subject: [PATCH] Remove XEmacs support from bookmark.el

* lisp/bookmark.el (bookmark-store): Remove XEmacs compat code.
---
 lisp/bookmark.el | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 5a9859d83d..e630771eb5 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -502,10 +502,7 @@ bookmark-store
 old one."
   (bookmark-maybe-load-default-file)
   (let ((stripped-name (copy-sequence name)))
-    (or (featurep 'xemacs)
-        ;; XEmacs's `set-text-properties' doesn't work on
-        ;; free-standing strings, apparently.
-        (set-text-properties 0 (length stripped-name) nil stripped-name))
+    (set-text-properties 0 (length stripped-name) nil stripped-name)
     (if (and (not no-overwrite)
              (bookmark-get-bookmark stripped-name 'noerror))
         ;; already existing bookmark under that name and
-- 
2.21.0