diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-22 03:11:04 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-22 03:11:04 +0000 |
| commit | 4211e4349d5f4af054de23de284b9fff451d3cc0 (patch) | |
| tree | 29b18b1fa0ee7c7167cc79bafee1ea888e6cc232 /lisp | |
| parent | 055f99f4994fbceee7652e4159110e1b6a17a0fa (diff) | |
| download | emacs-4211e4349d5f4af054de23de284b9fff451d3cc0.tar.gz | |
(bookmark-xemacsp): Remove.
(bookmark-make): Don't use bookmark-xemacsp, use
(featurep 'xemacs) instead.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/bookmark.el | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0b813e44bb..6d3909928c8 100644 --- 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 c1904cb0393..47a1d651598 100644 --- 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)) |