aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2019-06-13 16:02:39 +0200
committerLars Ingebrigtsen2019-06-13 16:02:39 +0200
commit4ec926dc033f1de81c05c19a2254c8a2bd1a042a (patch)
tree11eac5522f4fca79cdf911f0db10ed9b07ac9958
parente6e4a05087431c90b96636325ca7d2eac00c95c8 (diff)
downloademacs-4ec926dc033f1de81c05c19a2254c8a2bd1a042a.tar.gz
emacs-4ec926dc033f1de81c05c19a2254c8a2bd1a042a.zip
Remove XEmacs support from bookmark.el
* lisp/bookmark.el (bookmark-store): Remove XEmacs compat code (bug#36189).
-rw-r--r--lisp/bookmark.el5
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 5a9859d83df..e630771eb5f 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -502,10 +502,7 @@ exists in `bookmark-alist', record the new bookmark without throwing away the
502old one." 502old one."
503 (bookmark-maybe-load-default-file) 503 (bookmark-maybe-load-default-file)
504 (let ((stripped-name (copy-sequence name))) 504 (let ((stripped-name (copy-sequence name)))
505 (or (featurep 'xemacs) 505 (set-text-properties 0 (length stripped-name) nil stripped-name)
506 ;; XEmacs's `set-text-properties' doesn't work on
507 ;; free-standing strings, apparently.
508 (set-text-properties 0 (length stripped-name) nil stripped-name))
509 (if (and (not no-overwrite) 506 (if (and (not no-overwrite)
510 (bookmark-get-bookmark stripped-name 'noerror)) 507 (bookmark-get-bookmark stripped-name 'noerror))
511 ;; already existing bookmark under that name and 508 ;; already existing bookmark under that name and