diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-16 03:21:18 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-16 03:21:18 +0000 |
commit | fd6c51348d61f24ff74319520446456209cbb6a2 (patch) | |
tree | e68f1a2314bd55f3419e5514cbc83b6c7a66d1ef /lisp/subr.el | |
parent | ba8d1a2c37549533ca947c3788d82e46c9fcd7fc (diff) | |
download | emacs-fd6c51348d61f24ff74319520446456209cbb6a2.tar.gz |
(error, sit-for, start-process-shell-command)
(start-file-process-shell-command): Use the new
set-advertised-calling-convention feature.
Diffstat (limited to 'lisp/subr.el')
-rw-r--r-- | lisp/subr.el | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 20a692c22a8..070f472a3b6 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -229,13 +229,13 @@ This function accepts any number of arguments, but ignores them." (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 @@ The value of DEFAULT is inserted into PROMPT." 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 @@ An obsolete, but still supported form is \(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 @@ Strip text properties from the inserted text according to ;;;; 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 @@ COMMAND is the shell command to run. 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) |