aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emms-compat.el12
-rw-r--r--emms-lastfm.el5
-rw-r--r--emms-mark.el4
-rw-r--r--emms-tag-editor.el5
4 files changed, 19 insertions, 7 deletions
diff --git a/emms-compat.el b/emms-compat.el
index 748f487..8537156 100644
--- a/emms-compat.el
+++ b/emms-compat.el
@@ -37,6 +37,18 @@
(set-text-properties 0 (length string) properties string)
string))
+;; Emacs accepts three arguments to `make-obsolete', but the XEmacs
+;; version only takes two arguments
+(defun emms-make-obsolete (old-name new-name when)
+ "Make the byte-compiler warn that OLD-NAME is obsolete.
+The warning will say that NEW-NAME should be used instead.
+WHEN should be a string indicating when the function was
+first made obsolete, either the file's revision number or an
+EMMS release version number."
+ (condition-case nil
+ (make-obsolete old-name new-name when)
+ (wrong-number-of-arguments (make-obsolete old-name new-name))))
+
;;; Time and timers
diff --git a/emms-lastfm.el b/emms-lastfm.el
index bcf1c0f..f1d075e 100644
--- a/emms-lastfm.el
+++ b/emms-lastfm.el
@@ -195,9 +195,8 @@ the current track, too."
emms-lastfm-current-track nil)
(message "EMMS Last.fm plugin deactivated")))))
-(defalias 'emms-lastfm-activate 'emms-lastfm
- "Obsolete! Use `emms-lastfm-enable', `emms-lastfm-disable' or
-`emms-lastfm'.")
+(defalias 'emms-lastfm-activate 'emms-lastfm)
+(emms-make-obsolete 'emms-lastfm-activate 'emms-lastfm "EMMS 2.2")
(defun emms-lastfm-enable ()
"Enable the emms last.fm plugin."
diff --git a/emms-mark.el b/emms-mark.el
index 84d82d5..3ea0b96 100644
--- a/emms-mark.el
+++ b/emms-mark.el
@@ -76,8 +76,8 @@
(> arg 0))
(setq track (get-text-property (point) 'emms-track))
(delete-char 1)
- (insert (propertize (string emms-mark-char)
- 'emms-track track))
+ (insert (emms-propertize (string emms-mark-char)
+ 'emms-track track))
(backward-char 1)
(put-text-property (point) (progn (forward-line 1) (point))
'face face)
diff --git a/emms-tag-editor.el b/emms-tag-editor.el
index 0bb6bdd..51e423d 100644
--- a/emms-tag-editor.el
+++ b/emms-tag-editor.el
@@ -58,8 +58,9 @@
(format "%%m\n%-16s = %%f\n%s\n\n" "name"
(mapconcat
(lambda (tag)
- (concat (propertize (format "%-16s = " (symbol-name tag))
- 'read-only t 'rear-nonsticky t 'face 'bold)
+ (concat (emms-propertize (format "%-16s = " (symbol-name tag))
+ 'read-only t 'rear-nonsticky t
+ 'face 'bold)
"%" (cdr (assoc tag emms-tag-editor-tags))))
tags "\n")))