[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog subr.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog subr.el |
Date: |
Fri, 16 Oct 2009 05:04:01 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 09/10/16 05:04:00
Modified files:
lisp : ChangeLog subr.el
Log message:
* subr.el (error, sit-for, start-process-shell-command)
(start-file-process-shell-command): Set the calling convention
after the function definition.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16434&r2=1.16435
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.659&r2=1.660
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16434
retrieving revision 1.16435
diff -u -b -r1.16434 -r1.16435
--- ChangeLog 16 Oct 2009 03:21:18 -0000 1.16434
+++ ChangeLog 16 Oct 2009 05:03:56 -0000 1.16435
@@ -1,3 +1,9 @@
+2009-10-16 Juanma Barranquero <address@hidden>
+
+ * 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 <address@hidden>
* subr.el (error, sit-for, start-process-shell-command)
Index: subr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subr.el,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -b -r1.659 -r1.660
--- subr.el 16 Oct 2009 03:21:21 -0000 1.659
+++ subr.el 16 Oct 2009 05:04:00 -0000 1.660
@@ -230,7 +230,6 @@
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 @@
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 @@
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 @@
(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 @@
;;;; 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 @@
;; 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 @@
(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)