changeset 84777:68033fec6867

(bookmark-xemacsp): Remove. (bookmark-make): Don't use bookmark-xemacsp, use (featurep 'xemacs) instead.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 22 Sep 2007 03:11:04 +0000
parents 8e111156b7d2
children 7e5ed8ab5358
files lisp/ChangeLog lisp/bookmark.el
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Sep 22 02:46:35 2007 +0000
+++ b/lisp/ChangeLog	Sat Sep 22 03:11:04 2007 +0000
@@ -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)
--- a/lisp/bookmark.el	Sat Sep 22 02:46:35 2007 +0000
+++ b/lisp/bookmark.el	Sat Sep 22 03:11:04 2007 +0000
@@ -207,11 +207,6 @@
 
 ;;; 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 @@
 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))