(bookmark-xemacsp): Remove.

(bookmark-make): Don't use bookmark-xemacsp, use
(featurep 'xemacs) instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0b813e44bbac874bccd83bce180423991ff38ed..6d3909928c81cecb9a46f7a9123f2a1d24d09120 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * bookmark.el (bookmark-xemacsp): Remove.
+       (bookmark-make): Don't use bookmark-xemacsp, use
+       (featurep 'xemacs) instead.
+
        * speedbar.el (speedbar-frame-mode)
        (speedbar-frame-reposition-smartly)
        (speedbar-set-mode-line-format, speedbar-reconfigure-keymaps)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index c1904cb0393b53a365bf9089810d5f2901419319..47a1d651598c86bc75e6594fcb62de28bfc90944 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -207,11 +207,6 @@ following in your `.emacs' file:
 
 ;;; No user-serviceable parts beyond this point.
 
-;; Is it XEmacs?
-(defconst bookmark-xemacsp
-  (string-match "\\(Lucid\\|Xemacs\\)" emacs-version))
-
-
 ;; Added  for lucid emacs  compatibility, db
 (or (fboundp 'defalias)  (fset 'defalias 'fset))
 
@@ -495,7 +490,7 @@ Optional fourth arg INFO-NODE means this bookmark is at info node
 INFO-NODE, so record this fact in the bookmark's entry."
   (bookmark-maybe-load-default-file)
   (let ((stripped-name (copy-sequence name)))
-    (or bookmark-xemacsp
+    (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))