diff options
| author | Juanma Barranquero | 2009-01-12 20:34:48 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-01-12 20:34:48 +0000 |
| commit | d7f90d6c8512e4580c3c478285ffd0a14c23f14c (patch) | |
| tree | 6b09388146b41ff441f6c814fbb17528a96c1a43 | |
| parent | 24f0147080b202d6a1aedb90d4e9945deafcf2fd (diff) | |
| download | emacs-d7f90d6c8512e4580c3c478285ffd0a14c23f14c.tar.gz emacs-d7f90d6c8512e4580c3c478285ffd0a14c23f14c.zip | |
* subr.el (play-sound): Doc fix. (Bug#250)
(shell-quote-argument, field-at-pos): Fix typos in docstrings.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1687d8cfa74..87f34a67970 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-01-12 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * subr.el (play-sound): Doc fix. (Bug#250) | ||
| 4 | (shell-quote-argument, field-at-pos): Fix typos in docstrings. | ||
| 5 | |||
| 1 | 2009-01-12 Alan Mackenzie <acm@muc.de> | 6 | 2009-01-12 Alan Mackenzie <acm@muc.de> |
| 2 | 7 | ||
| 3 | * textmodes/paragraphs.el (forward-sentence): Change limit of | 8 | * textmodes/paragraphs.el (forward-sentence): Change limit of |
diff --git a/lisp/subr.el b/lisp/subr.el index 18c365d4d55..6a7b4ac54ff 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -2255,7 +2255,9 @@ range 0..100 or a float in the range 0..1.0. If not specified, | |||
| 2255 | don't change the volume setting of the sound device. | 2255 | don't change the volume setting of the sound device. |
| 2256 | 2256 | ||
| 2257 | :device DEVICE - play sound on DEVICE. If not specified, | 2257 | :device DEVICE - play sound on DEVICE. If not specified, |
| 2258 | a system-dependent default device name is used." | 2258 | a system-dependent default device name is used. |
| 2259 | |||
| 2260 | Note: :data and :device are currently not supported on Windows." | ||
| 2259 | (if (fboundp 'play-sound-internal) | 2261 | (if (fboundp 'play-sound-internal) |
| 2260 | (play-sound-internal sound) | 2262 | (play-sound-internal sound) |
| 2261 | (error "This Emacs binary lacks sound support"))) | 2263 | (error "This Emacs binary lacks sound support"))) |
| @@ -2263,7 +2265,7 @@ a system-dependent default device name is used." | |||
| 2263 | (declare-function w32-shell-dos-semantics "w32-fns" nil) | 2265 | (declare-function w32-shell-dos-semantics "w32-fns" nil) |
| 2264 | 2266 | ||
| 2265 | (defun shell-quote-argument (argument) | 2267 | (defun shell-quote-argument (argument) |
| 2266 | "Quote an argument for passing as argument to an inferior shell." | 2268 | "Quote ARGUMENT for passing as argument to an inferior shell." |
| 2267 | (if (or (eq system-type 'ms-dos) | 2269 | (if (or (eq system-type 'ms-dos) |
| 2268 | (and (eq system-type 'windows-nt) (w32-shell-dos-semantics))) | 2270 | (and (eq system-type 'windows-nt) (w32-shell-dos-semantics))) |
| 2269 | ;; Quote using double quotes, but escape any existing quotes in | 2271 | ;; Quote using double quotes, but escape any existing quotes in |
| @@ -2301,7 +2303,7 @@ Otherwise, return nil." | |||
| 2301 | (memq object '(nil t))) | 2303 | (memq object '(nil t))) |
| 2302 | 2304 | ||
| 2303 | (defun field-at-pos (pos) | 2305 | (defun field-at-pos (pos) |
| 2304 | "Return the field at position POS, taking stickiness etc into account" | 2306 | "Return the field at position POS, taking stickiness etc into account." |
| 2305 | (let ((raw-field (get-char-property (field-beginning pos) 'field))) | 2307 | (let ((raw-field (get-char-property (field-beginning pos) 'field))) |
| 2306 | (if (eq raw-field 'boundary) | 2308 | (if (eq raw-field 'boundary) |
| 2307 | (get-char-property (1- (field-end pos)) 'field) | 2309 | (get-char-property (1- (field-end pos)) 'field) |