diff options
| author | Juanma Barranquero | 2009-12-02 02:08:21 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-12-02 02:08:21 +0000 |
| commit | c710ac3c08b7657f775b5d5f63bf98d3c71f2a5d (patch) | |
| tree | 8f0a180d363815b08224574f0e38b98e2907a2ce | |
| parent | 7fa123c8f7d2b368e6a10739bcc26252d4511a01 (diff) | |
| download | emacs-c710ac3c08b7657f775b5d5f63bf98d3c71f2a5d.tar.gz emacs-c710ac3c08b7657f775b5d5f63bf98d3c71f2a5d.zip | |
* mpc.el (mpc-intersection, mpc-host, mpc-songs-playlist)
(mpc-songs-jump-to, mpc-resume): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/mpc.el | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c0586d9b4ee..0fe7ef21efc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-12-02 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * mpc.el (mpc-intersection, mpc-host, mpc-songs-playlist) | ||
| 4 | (mpc-songs-jump-to, mpc-resume): Doc fixes. | ||
| 5 | |||
| 1 | 2009-12-01 Rob Riepel <riepel@networking.Stanford.EDU> | 6 | 2009-12-01 Rob Riepel <riepel@networking.Stanford.EDU> |
| 2 | 7 | ||
| 3 | * emulation/tpu-extras.el (tpu-cursor-free-mode): Emit message. | 8 | * emulation/tpu-extras.el (tpu-cursor-free-mode): Emit message. |
| @@ -49,7 +54,7 @@ | |||
| 49 | 2009-12-01 Dan Nicolaescu <dann@ics.uci.edu> | 54 | 2009-12-01 Dan Nicolaescu <dann@ics.uci.edu> |
| 50 | 55 | ||
| 51 | Make vc-print-log buttons work. | 56 | Make vc-print-log buttons work. |
| 52 | * log-view.el (log-view-mode-map): Inherit from from widget-keymap. | 57 | * log-view.el (log-view-mode-map): Inherit from from widget-keymap. |
| 53 | 58 | ||
| 54 | 2009-11-30 Ryan C. Thompson <rct@thompsonclan.org> (tiny change) | 59 | 2009-11-30 Ryan C. Thompson <rct@thompsonclan.org> (tiny change) |
| 55 | 60 | ||
diff --git a/lisp/mpc.el b/lisp/mpc.el index 22c03dd66f2..b099d039ebb 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | ;; - add bindings/buttons/menuentries for the various commands. | 42 | ;; - add bindings/buttons/menuentries for the various commands. |
| 43 | ;; - mpc-undo | 43 | ;; - mpc-undo |
| 44 | ;; - visual feedback for drag'n'drop | 44 | ;; - visual feedback for drag'n'drop |
| 45 | ;; - display/set `repeat' and `random' state (and maybe also `crossfade'). | 45 | ;; - display/set `repeat' and `random' state (and maybe also `crossfade'). |
| 46 | ;; - allow multiple *mpc* sessions in the same Emacs to control different mpds. | 46 | ;; - allow multiple *mpc* sessions in the same Emacs to control different mpds. |
| 47 | ;; - look for .folder.png (freedesktop) or folder.jpg (XP) as well. | 47 | ;; - look for .folder.png (freedesktop) or folder.jpg (XP) as well. |
| 48 | ;; - fetch album covers and lyrics from the web? | 48 | ;; - fetch album covers and lyrics from the web? |
| @@ -163,8 +163,8 @@ | |||
| 163 | 163 | ||
| 164 | (defun mpc-intersection (l1 l2 &optional selectfun) | 164 | (defun mpc-intersection (l1 l2 &optional selectfun) |
| 165 | "Return L1 after removing all elements not found in L2. | 165 | "Return L1 after removing all elements not found in L2. |
| 166 | SELECTFUN if non-nil elements aren't compared directly, but instead they | 166 | If SELECTFUN is non-nil, elements aren't compared directly, but instead |
| 167 | are passed through SELECTFUN before comparison." | 167 | they are passed through SELECTFUN before comparison." |
| 168 | (let ((res ())) | 168 | (let ((res ())) |
| 169 | (if selectfun (setq l2 (mapcar selectfun l2))) | 169 | (if selectfun (setq l2 (mapcar selectfun l2))) |
| 170 | (dolist (elem l1) | 170 | (dolist (elem l1) |
| @@ -241,7 +241,7 @@ numerically rather than lexicographically." | |||
| 241 | (if (getenv "MPD_PORT") (concat ":" (getenv "MPD_PORT")))) | 241 | (if (getenv "MPD_PORT") (concat ":" (getenv "MPD_PORT")))) |
| 242 | "Host (and port) where the Music Player Daemon is running. | 242 | "Host (and port) where the Music Player Daemon is running. |
| 243 | The format is \"HOST\" or \"HOST:PORT\" where PORT defaults to 6600 | 243 | The format is \"HOST\" or \"HOST:PORT\" where PORT defaults to 6600 |
| 244 | and HOST default to localhost." | 244 | and HOST defaults to localhost." |
| 245 | :type 'string) | 245 | :type 'string) |
| 246 | 246 | ||
| 247 | (defvar mpc-proc nil) | 247 | (defvar mpc-proc nil) |
| @@ -1670,7 +1670,7 @@ Return non-nil if a selection was deactivated." | |||
| 1670 | 1670 | ||
| 1671 | (defvar mpc-songs-playlist nil | 1671 | (defvar mpc-songs-playlist nil |
| 1672 | "Name of the currently selected playlist, if any. | 1672 | "Name of the currently selected playlist, if any. |
| 1673 | t means the main playlist.") | 1673 | A value of t means the main playlist.") |
| 1674 | (make-variable-buffer-local 'mpc-songs-playlist) | 1674 | (make-variable-buffer-local 'mpc-songs-playlist) |
| 1675 | 1675 | ||
| 1676 | (defun mpc-playlist-create (name) | 1676 | (defun mpc-playlist-create (name) |
| @@ -1954,7 +1954,7 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 1954 | (nreverse files))))))) | 1954 | (nreverse files))))))) |
| 1955 | 1955 | ||
| 1956 | (defun mpc-songs-jump-to (song-file &optional posn) | 1956 | (defun mpc-songs-jump-to (song-file &optional posn) |
| 1957 | "Jump to song SONG-FILE, interactively, this is the song at point." | 1957 | "Jump to song SONG-FILE; interactively, this is the song at point." |
| 1958 | (interactive | 1958 | (interactive |
| 1959 | (let* ((event last-nonmenu-event) | 1959 | (let* ((event last-nonmenu-event) |
| 1960 | (posn (event-end event))) | 1960 | (posn (event-end event))) |
| @@ -2258,7 +2258,7 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 2258 | (mpc-cmd-pause "1")) | 2258 | (mpc-cmd-pause "1")) |
| 2259 | 2259 | ||
| 2260 | (defun mpc-resume () | 2260 | (defun mpc-resume () |
| 2261 | "Pause playing." | 2261 | "Resume playing." |
| 2262 | (interactive) | 2262 | (interactive) |
| 2263 | (mpc-cmd-pause "0")) | 2263 | (mpc-cmd-pause "0")) |
| 2264 | 2264 | ||