andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* subr.el (error, sit-for, start-process-shell-command)

Browse source 
(start-file-process-shell-command): Set the calling convention
  after the function definition.
This commit is contained in:
Juanma Barranquero 2009-10-16 05:03:56 +00:00
parent 6e4780c5ad
commit f3ed9aca28
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2009-10-16 Juanma Barranquero <lekktu@gmail.com>
* subr.el (error, sit-for, start-process-shell-command)
(start-file-process-shell-command): Set the calling convention
after the function definition.
2009-10-16 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (error, sit-for, start-process-shell-command)

12
lisp/subr.el
View file

@ -230,7 +230,6 @@ This function accepts any number of arguments, but ignores them."
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
@ -238,6 +237,7 @@ letter but *do not* end with a period. Please follow this convention
for the sake of consistency."
(while t
(signal 'error (list (apply 'format args)))))
(set-advertised-calling-convention 'error '(string &rest args))
;; We put this here instead of in frame.el so that it's defined even on
;; systems where frame.el isn't loaded.
@ -2011,7 +2011,6 @@ 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.
@ -2052,6 +2051,7 @@ floating point support."
(setq read (cons t read)))
(push read unread-command-events)
nil))))))
(set-advertised-calling-convention 'sit-for '(seconds &optional nodisp))
;;; Atomic change groups.
@ -2564,8 +2564,6 @@ 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.
@ -2583,9 +2581,9 @@ discouraged."
;; 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
(set-advertised-calling-convention 'start-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'."
@ -2594,6 +2592,8 @@ Similar to `start-process-shell-command', but calls `start-file-process'."
(if (file-remote-p default-directory) "/bin/sh" shell-file-name)
(if (file-remote-p default-directory) "-c" shell-command-switch)
(mapconcat 'identity args " ")))
(set-advertised-calling-convention 'start-file-process-shell-command
'(name buffer command))
(defun call-process-shell-command (command &optional infile buffer display
&rest args)