* packages/ampc/ampc.el (ampc-highlight-current-song-mode): Delete

(ampc-current-playlist-mode): Set font-lock-defaults instead.
(ampc-item-mode): Remove broken highlight rule.
(ampc-handle-status): Use font-lock-flush when available.

diff --git a/packages/ampc/ampc.el b/packages/ampc/ampc.el
index 6e9bbd6fbd44dc24ee9cdce449a7f1c8616e39d0..7a28bc7e5e810c9cc8239cfb1f84bf75a674bf9a 100644 (file)
--- a/packages/ampc/ampc.el
+++ b/packages/ampc/ampc.el
@@ -986,7 +986,11 @@ modified."
 (define-derived-mode ampc-tag-song-mode ampc-item-mode "ampc-ts")
 
 (define-derived-mode ampc-current-playlist-mode ampc-playlist-mode "ampc-cpl"
-  (ampc-highlight-current-song-mode))
+  (setq font-lock-defaults `(((ampc-find-current-song
+                               (1 'ampc-current-song-mark-face)
+                               (2 'ampc-current-song-marked-face))
+                              . ,(car font-lock-defaults))
+                             . (cdr font-lock-defaults))))
 
 (define-derived-mode ampc-playlist-mode ampc-item-mode "ampc-pl")
 
@@ -1022,7 +1026,9 @@ modified."
   (setf font-lock-defaults '((("^\\(\\*\\)\\(.*\\)$"
                                (1 'ampc-mark-face)
                                (2 'ampc-marked-face))
-                              ("" 0 'ampc-unmarked-face))
+                              ;; FIXME: Why do this?
+                              ;; ("" 0 'ampc-unmarked-face)
+                              )
                              t)))
 
 (define-derived-mode ampc-mode special-mode "ampc"
@@ -1031,19 +1037,6 @@ modified."
   (setf truncate-lines ampc-truncate-lines
         mode-line-modified "--"))
 
-(define-minor-mode ampc-highlight-current-song-mode ""
-  ;; FIXME: The "" above looks bogus!
-  nil
-  nil
-  nil
-  (funcall (if ampc-highlight-current-song-mode
-               #'font-lock-add-keywords
-             #'font-lock-remove-keywords)
-           nil
-           '((ampc-find-current-song
-              (1 'ampc-current-song-mark-face)
-              (2 'ampc-current-song-marked-face)))))
-
 ;;;###autoload
 (define-minor-mode ampc-tagger-dired-mode
   "Minor mode that adds a audio file meta data tagging key binding to dired."
@@ -1982,8 +1975,9 @@ modified."
   (ampc-fill-status-var '("volume" "repeat" "random" "consume" "xfade" "state"
                           "song" "playlistlength"))
   (ampc-with-buffer 'current-playlist
-    (when ampc-highlight-current-song-mode
-      (font-lock-fontify-buffer)))
+    (if (fboundp 'font-lock-flush)
+        (font-lock-flush)
+      (with-no-warnings (font-lock-fontify-buffer))))
   (run-hook-with-args ampc-status-changed-hook ampc-status))
 
 (defun ampc-handle-update ()