Mercurial > emacs
changeset 105629:bdfcf9d2baaa
(error, sit-for, start-process-shell-command)
(start-file-process-shell-command): Use the new
set-advertised-calling-convention feature.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 16 Oct 2009 03:21:18 +0000 |
parents | ce25ad6994a1 |
children | e2e6510fb5ca |
files | lisp/ChangeLog lisp/subr.el |
diffstat | 2 files changed, 20 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 16 03:12:35 2009 +0000 +++ b/lisp/ChangeLog Fri Oct 16 03:21:18 2009 +0000 @@ -1,8 +1,14 @@ +2009-10-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * subr.el (error, sit-for, start-process-shell-command) + (start-file-process-shell-command): Use the new + set-advertised-calling-convention feature. + 2009-10-16 Taichi Kawabata <kawabata.taichi@gmail.com> - * international/ucs-normalize.el (ucs-normalize-version): Changed - to 1.2. - (check-range): Adjusted for Unicode 5.2. + * international/ucs-normalize.el (ucs-normalize-version): + Change to 1.2. + (check-range): Adjust for Unicode 5.2. 2009-10-15 Juri Linkov <juri@jurta.org>
--- a/lisp/subr.el Fri Oct 16 03:12:35 2009 +0000 +++ b/lisp/subr.el Fri Oct 16 03:21:18 2009 +0000 @@ -229,13 +229,13 @@ (interactive) nil) +;; Signal a compile-error if the first arg is missing. +(set-advertised-calling-convention 'error '(string &rest args)) (defun error (&rest args) "Signal an error, making error message by passing all args to `format'. In Emacs, the convention is that error messages start with a capital letter but *do not* end with a period. Please follow this convention -for the sake of consistency. - -\(fn STRING &rest ARGS)" +for the sake of consistency." (while t (signal 'error (list (apply 'format args))))) @@ -2011,6 +2011,7 @@ t))) n)) +(set-advertised-calling-convention 'sit-for '(seconds &optional nodisp)) (defun sit-for (seconds &optional nodisp obsolete) "Perform redisplay, then wait for SECONDS seconds or until input is available. SECONDS may be a floating-point value. @@ -2026,9 +2027,7 @@ \(sit-for SECONDS &optional MILLISECONDS NODISP) where the optional arg MILLISECONDS specifies an additional wait period, in milliseconds; this was useful when Emacs was built without -floating point support. - -\(fn SECONDS &optional NODISP)" +floating point support." (if (numberp nodisp) (setq seconds (+ seconds (* 1e-3 nodisp)) nodisp obsolete) @@ -2565,6 +2564,8 @@ ;;;; Synchronous shell commands. +(set-advertised-calling-convention 'start-process-shell-command + '(name buffer command)) (defun start-process-shell-command (name buffer &rest args) "Start a program in a subprocess. Return the process object for it. NAME is name for process. It is modified if necessary to make it unique. @@ -2577,19 +2578,17 @@ An old calling convention accepted any number of arguments after COMMAND, which were just concatenated to COMMAND. This is still supported but strongly -discouraged. - -\(fn NAME BUFFER COMMAND)" +discouraged." ;; We used to use `exec' to replace the shell with the command, ;; but that failed to handle (...) and semicolon, etc. (start-process name buffer shell-file-name shell-command-switch (mapconcat 'identity args " "))) +(set-advertised-calling-convention 'start-file-process-shell-command + '(name buffer command)) (defun start-file-process-shell-command (name buffer &rest args) "Start a program in a subprocess. Return the process object for it. -Similar to `start-process-shell-command', but calls `start-file-process'. - -\(fn NAME BUFFER COMMAND)" +Similar to `start-process-shell-command', but calls `start-file-process'." (start-file-process name buffer (if (file-remote-p default-directory) "/bin/sh" shell-file-name)