diff options
| author | Chong Yidong | 2009-12-01 16:21:36 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-12-01 16:21:36 +0000 |
| commit | 94423e8a319394ec6c3d1387ea86277797e10f7b (patch) | |
| tree | 6b0aca1e4f50a76846e9ae2c260b5ed94c51cb5a | |
| parent | 28f57f7e00dcf6ce1ab60f6389ab078719fe5fd3 (diff) | |
| download | emacs-94423e8a319394ec6c3d1387ea86277797e10f7b.tar.gz emacs-94423e8a319394ec6c3d1387ea86277797e10f7b.zip | |
Delete trailing whitespace.
| -rw-r--r-- | lisp/mpc.el | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/mpc.el b/lisp/mpc.el index 256f9a966a0..22c03dd66f2 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el | |||
| @@ -129,7 +129,7 @@ | |||
| 129 | (unless (fboundp 'buffer-local-value) | 129 | (unless (fboundp 'buffer-local-value) |
| 130 | (defun buffer-local-value (var buf) | 130 | (defun buffer-local-value (var buf) |
| 131 | (with-current-buffer buf (symbol-value var)))) | 131 | (with-current-buffer buf (symbol-value var)))) |
| 132 | 132 | ||
| 133 | 133 | ||
| 134 | ;;; Main code starts here. | 134 | ;;; Main code starts here. |
| 135 | 135 | ||
| @@ -152,7 +152,7 @@ | |||
| 152 | (not (member (setq val (cdr elem)) res))) | 152 | (not (member (setq val (cdr elem)) res))) |
| 153 | (push val res))) | 153 | (push val res))) |
| 154 | (nreverse res))) | 154 | (nreverse res))) |
| 155 | 155 | ||
| 156 | (defun mpc-union (&rest lists) | 156 | (defun mpc-union (&rest lists) |
| 157 | (let ((res (nreverse (pop lists)))) | 157 | (let ((res (nreverse (pop lists)))) |
| 158 | (dolist (list lists) | 158 | (dolist (list lists) |
| @@ -817,7 +817,7 @@ If PLAYLIST is t or nil or missing, use the main playlist." | |||
| 817 | (sort song-poss '>)))) | 817 | (sort song-poss '>)))) |
| 818 | (if (stringp playlist) | 818 | (if (stringp playlist) |
| 819 | (puthash (cons 'Playlist playlist) nil mpc--find-memoize))) | 819 | (puthash (cons 'Playlist playlist) nil mpc--find-memoize))) |
| 820 | 820 | ||
| 821 | 821 | ||
| 822 | (defun mpc-cmd-move (song-poss dest-pos &optional playlist) | 822 | (defun mpc-cmd-move (song-poss dest-pos &optional playlist) |
| 823 | (let ((i 0)) | 823 | (let ((i 0)) |
| @@ -1056,7 +1056,7 @@ If PLAYLIST is t or nil or missing, use the main playlist." | |||
| 1056 | (setq col (+ col size)))))) | 1056 | (setq col (+ col size)))))) |
| 1057 | (put-text-property start (point) 'mpc-pred | 1057 | (put-text-property start (point) 'mpc-pred |
| 1058 | `(lambda (info) (and ,@(nreverse pred)))))) | 1058 | `(lambda (info) (and ,@(nreverse pred)))))) |
| 1059 | 1059 | ||
| 1060 | ;;; The actual UI code ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 1060 | ;;; The actual UI code ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 1061 | 1061 | ||
| 1062 | (defvar mpc-mode-map | 1062 | (defvar mpc-mode-map |
| @@ -1503,7 +1503,7 @@ when constructing the set of constraints." | |||
| 1503 | (overlay-put ol 'face 'region) | 1503 | (overlay-put ol 'face 'region) |
| 1504 | (overlay-put ol 'evaporate t) | 1504 | (overlay-put ol 'evaporate t) |
| 1505 | (set (make-local-variable 'mpc-tagbrowser-all-ol) ol)))))) | 1505 | (set (make-local-variable 'mpc-tagbrowser-all-ol) ol)))))) |
| 1506 | 1506 | ||
| 1507 | ;; (defvar mpc-constraints nil) | 1507 | ;; (defvar mpc-constraints nil) |
| 1508 | (defun mpc-separator (active) | 1508 | (defun mpc-separator (active) |
| 1509 | ;; Place a separator mark. | 1509 | ;; Place a separator mark. |
| @@ -1555,7 +1555,7 @@ when constructing the set of constraints." | |||
| 1555 | (cond | 1555 | (cond |
| 1556 | ((member name active) (concat "1" name)) | 1556 | ((member name active) (concat "1" name)) |
| 1557 | (t (concat "2" "name")))))))))) | 1557 | (t (concat "2" "name")))))))))) |
| 1558 | 1558 | ||
| 1559 | (defvar mpc--changed-selection) | 1559 | (defvar mpc--changed-selection) |
| 1560 | 1560 | ||
| 1561 | (defun mpc-reorder (&optional nodeactivate) | 1561 | (defun mpc-reorder (&optional nodeactivate) |
| @@ -1576,7 +1576,7 @@ Return non-nil if a selection was deactivated." | |||
| 1576 | (cdr cst))))) | 1576 | (cdr cst))))) |
| 1577 | (setq active | 1577 | (setq active |
| 1578 | (if (listp active) (mpc-intersection active vals) vals)))) | 1578 | (if (listp active) (mpc-intersection active vals) vals)))) |
| 1579 | 1579 | ||
| 1580 | (when (and (listp active)) | 1580 | (when (and (listp active)) |
| 1581 | ;; Remove the selections if they are all in conflict with | 1581 | ;; Remove the selections if they are all in conflict with |
| 1582 | ;; other constraints. | 1582 | ;; other constraints. |
| @@ -1664,7 +1664,7 @@ Return non-nil if a selection was deactivated." | |||
| 1664 | nil x)) | 1664 | nil x)) |
| 1665 | new))))) | 1665 | new))))) |
| 1666 | (mpc-tagbrowser-refresh))) | 1666 | (mpc-tagbrowser-refresh))) |
| 1667 | 1667 | ||
| 1668 | 1668 | ||
| 1669 | ;;; Playlist management ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 1669 | ;;; Playlist management ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 1670 | 1670 | ||
| @@ -1925,7 +1925,7 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 1925 | (when (buffer-local-value 'mpc-tag buf) | 1925 | (when (buffer-local-value 'mpc-tag buf) |
| 1926 | (with-current-buffer buf (mpc-reorder)))) | 1926 | (with-current-buffer buf (mpc-reorder)))) |
| 1927 | (mpc-songs-refresh)))) | 1927 | (mpc-songs-refresh)))) |
| 1928 | 1928 | ||
| 1929 | (defun mpc-songs-kill-search () | 1929 | (defun mpc-songs-kill-search () |
| 1930 | "Turn off the current search restriction." | 1930 | "Turn off the current search restriction." |
| 1931 | (interactive) | 1931 | (interactive) |
| @@ -2052,7 +2052,7 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 2052 | follow-link t | 2052 | follow-link t |
| 2053 | mouse-face mode-line-highlight | 2053 | mouse-face mode-line-highlight |
| 2054 | keymap (keymap (mode-line keymap (mouse-2 . mpc-songs-search))))))) | 2054 | keymap (keymap (mode-line keymap (mouse-2 . mpc-songs-search))))))) |
| 2055 | 2055 | ||
| 2056 | ;; (set (make-local-variable 'mode-line-process) | 2056 | ;; (set (make-local-variable 'mode-line-process) |
| 2057 | ;; '("" ;; mpc-volume " " | 2057 | ;; '("" ;; mpc-volume " " |
| 2058 | ;; mpc-songs-totaltime | 2058 | ;; mpc-songs-totaltime |
| @@ -2244,7 +2244,7 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 2244 | (mapc 'kill-buffer bufs) | 2244 | (mapc 'kill-buffer bufs) |
| 2245 | (mpc-status-stop) | 2245 | (mpc-status-stop) |
| 2246 | (if proc (delete-process proc)))) | 2246 | (if proc (delete-process proc)))) |
| 2247 | 2247 | ||
| 2248 | (defun mpc-stop () | 2248 | (defun mpc-stop () |
| 2249 | "Stop playing the current queue of songs." | 2249 | "Stop playing the current queue of songs." |
| 2250 | (interactive) | 2250 | (interactive) |
| @@ -2386,13 +2386,13 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 2386 | (lambda () | 2386 | (lambda () |
| 2387 | (let ((newsongid (cdr (assq 'songid mpc-status))) | 2387 | (let ((newsongid (cdr (assq 'songid mpc-status))) |
| 2388 | (newsongnb (cdr (assq 'song mpc-status)))) | 2388 | (newsongnb (cdr (assq 'song mpc-status)))) |
| 2389 | 2389 | ||
| 2390 | (if (and (equal prevsongid newsongid) | 2390 | (if (and (equal prevsongid newsongid) |
| 2391 | (not (equal prevsongid songid))) | 2391 | (not (equal prevsongid songid))) |
| 2392 | ;; We left prevsongid and came back to it. Pretend it | 2392 | ;; We left prevsongid and came back to it. Pretend it |
| 2393 | ;; didn't happen. | 2393 | ;; didn't happen. |
| 2394 | (setq newsongid songid)) | 2394 | (setq newsongid songid)) |
| 2395 | 2395 | ||
| 2396 | (cond | 2396 | (cond |
| 2397 | ((null newsongid) (mpc--faster-stop)) | 2397 | ((null newsongid) (mpc--faster-stop)) |
| 2398 | ((not (equal songid newsongid)) | 2398 | ((not (equal songid newsongid)) |
| @@ -2452,14 +2452,14 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 2452 | (interactive (list last-nonmenu-event)) | 2452 | (interactive (list last-nonmenu-event)) |
| 2453 | ;; (mpc--faster event 4.0 1) | 2453 | ;; (mpc--faster event 4.0 1) |
| 2454 | (mpc--faster-toggle mpc-faster-speedup 1)) | 2454 | (mpc--faster-toggle mpc-faster-speedup 1)) |
| 2455 | 2455 | ||
| 2456 | (defun mpc-rewind (event) | 2456 | (defun mpc-rewind (event) |
| 2457 | "Fast rewind." | 2457 | "Fast rewind." |
| 2458 | (interactive (list last-nonmenu-event)) | 2458 | (interactive (list last-nonmenu-event)) |
| 2459 | ;; (mpc--faster event 4.0 -1) | 2459 | ;; (mpc--faster event 4.0 -1) |
| 2460 | (mpc--faster-toggle mpc-faster-speedup -1)) | 2460 | (mpc--faster-toggle mpc-faster-speedup -1)) |
| 2461 | 2461 | ||
| 2462 | 2462 | ||
| 2463 | (defun mpc-play-at-point (&optional event) | 2463 | (defun mpc-play-at-point (&optional event) |
| 2464 | (interactive (list last-nonmenu-event)) | 2464 | (interactive (list last-nonmenu-event)) |
| 2465 | (mpc-select event) | 2465 | (mpc-select event) |