[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117609: * lisp/subr.el (call-process-shell-comma
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117609: * lisp/subr.el (call-process-shell-command, process-file-shell-command): |
Date: |
Mon, 20 Oct 2014 22:44:20 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117609
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18409
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-20 18:44:11 -0400
message:
* lisp/subr.el (call-process-shell-command, process-file-shell-command):
Make the `args' obsolete.
(start-process-shell-command, start-file-process-shell-command):
Use `declare'.
modified:
etc/NEWS news-20100311060928-aoit31wvzf25yr1z-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2014-10-20 22:12:13 +0000
+++ b/etc/NEWS 2014-10-20 22:44:11 +0000
@@ -31,6 +31,10 @@
- contact address@hidden if you disagree.
** cc-compat.el is marked as obsolete.
+
+** call-process-shell-command and process-file-shell-command
+don't take "&rest args" any more.
+
* Installation Changes in Emacs 24.4
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-20 22:41:19 +0000
+++ b/lisp/ChangeLog 2014-10-20 22:44:11 +0000
@@ -1,4 +1,11 @@
-2014-03-20 Juanma Barranquero <address@hidden>
+2014-09-05 Stefan Monnier <address@hidden>
+
+ * subr.el (call-process-shell-command, process-file-shell-command):
+ Make the `args' obsolete (bug#18409).
+ (start-process-shell-command, start-file-process-shell-command):
+ Use `declare'.
+
+2014-10-20 Juanma Barranquero <address@hidden>
* skeleton.el (skeleton-autowrap): Mark as obsolete. Doc fix.
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2014-10-20 22:39:30 +0000
+++ b/lisp/dired.el 2014-10-20 22:44:11 +0000
@@ -3883,7 +3883,7 @@
;;; Start of automatically extracted autoloads.
-;;;### (autoloads nil "dired-aux" "dired-aux.el"
"1a8e2a4a9117ab3a2586aa001358d3fb")
+;;;### (autoloads nil "dired-aux" "dired-aux.el"
"6969bb4414a8a31b91342ab922a94efb")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\
@@ -4386,7 +4386,7 @@
;;;***
-;;;### (autoloads nil "dired-x" "dired-x.el"
"291bc6e869bf72c900604c45d40f45ed")
+;;;### (autoloads nil "dired-x" "dired-x.el"
"994b5d9fc38059ab641ec271c728e56f")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2014-09-04 15:21:40 +0000
+++ b/lisp/subr.el 2014-10-20 22:44:11 +0000
@@ -2879,23 +2879,21 @@
An old calling convention accepted any number of arguments after COMMAND,
which were just concatenated to COMMAND. This is still supported but strongly
discouraged."
- ;; We used to use `exec' to replace the shell with the command,
- ;; but that failed to handle (...) and semicolon, etc.
+ (declare (advertised-calling-convention (name buffer command) "23.1"))
+ ;; 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-process-shell-command
- '(name buffer command) "23.1")
(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'."
+ (declare (advertised-calling-convention (name buffer command) "23.1"))
(start-file-process
name buffer
(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) "23.1")
(defun call-process-shell-command (command &optional infile buffer display
&rest args)
@@ -2911,13 +2909,18 @@
t (mix it with ordinary output), or a file name string.
Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted.
-Remaining arguments are strings passed as additional arguments for COMMAND.
Wildcards and redirection are handled as usual in the shell.
If BUFFER is 0, `call-process-shell-command' returns immediately with value
nil.
Otherwise it waits for COMMAND to terminate and returns a numeric exit
status or a signal description string.
-If you quit, the process is killed with SIGINT, or SIGKILL if you quit again."
+If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
+
+An old calling convention accepted any number of arguments after DISPLAY,
+which were just concatenated to COMMAND. This is still supported but strongly
+discouraged."
+ (declare (advertised-calling-convention
+ (command &optional infile buffer display) "24.5"))
;; We used to use `exec' to replace the shell with the command,
;; but that failed to handle (...) and semicolon, etc.
(call-process shell-file-name
@@ -2929,6 +2932,8 @@
&rest args)
"Process files synchronously in a separate process.
Similar to `call-process-shell-command', but calls `process-file'."
+ (declare (advertised-calling-convention
+ (command &optional infile buffer display) "24.5"))
(process-file
(if (file-remote-p default-directory) "/bin/sh" shell-file-name)
infile buffer display
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117609: * lisp/subr.el (call-process-shell-command, process-file-shell-command):,
Stefan Monnier <=