[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ff40055 1/7: Make emerge always use shell-quote-arg
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master ff40055 1/7: Make emerge always use shell-quote-argument |
Date: |
Sat, 6 Aug 2016 20:16:32 +0000 (UTC) |
branch: master
commit ff400557e8d28d53d745f04268a35fb3e3e3ddf8
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Make emerge always use shell-quote-argument
* lisp/vc/emerge.el (emerge-metachars): Obsolete.
(emerge-protect-metachars): Delete.
(emerge-make-diff-list, emerge-make-diff3-list): Replace all calls to
`emerge-protect-metachars' with `shell-quote-argument' so that shell
quoting is done the same on all system types (Bug #6136). Also shell
quote `emerge-diff-program' and `emerge-diff3-program'.
---
lisp/vc/emerge.el | 37 ++++++++++++-------------------------
1 file changed, 12 insertions(+), 25 deletions(-)
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index de25cba..058b15c 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -621,9 +621,10 @@ This is *not* a user option, since Emerge uses it for its
own processing.")
(erase-buffer)
(shell-command
(format "%s %s %s %s"
- emerge-diff-program emerge-diff-options
- (emerge-protect-metachars file-A)
- (emerge-protect-metachars file-B))
+ (shell-quote-argument emerge-diff-program)
+ emerge-diff-options
+ (shell-quote-argument file-A)
+ (shell-quote-argument file-B))
t))
(emerge-prepare-error-list emerge-diff-ok-lines-regexp)
(emerge-convert-diffs-to-markers
@@ -792,10 +793,11 @@ This is *not* a user option, since Emerge uses it for its
own processing.")
(erase-buffer)
(shell-command
(format "%s %s %s %s %s"
- emerge-diff3-program emerge-diff-options
- (emerge-protect-metachars file-A)
- (emerge-protect-metachars file-ancestor)
- (emerge-protect-metachars file-B))
+ (shell-quote-argument emerge-diff3-program)
+ emerge-diff-options
+ (shell-quote-argument file-A)
+ (shell-quote-argument file-ancestor)
+ (shell-quote-argument file-B))
t))
(emerge-prepare-error-list emerge-diff3-ok-lines-regexp)
(emerge-convert-diffs-to-markers
@@ -3171,26 +3173,11 @@ See also `auto-save-file-name-p'."
;; Metacharacters that have to be protected from the shell when executing
;; a diff/diff3 command.
-(defcustom emerge-metachars
- (if (memq system-type '(ms-dos windows-nt))
- "[ \t\"<>|?*^&=]"
- "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]")
- "Characters that must be quoted when used in a shell command line.
-More precisely, a [...] regexp to match any one such character."
+(defcustom emerge-metachars nil
+ "Obsolete, emerge now uses `shell-quote-argument'."
:type 'regexp
:group 'emerge)
-
-;; Quote metacharacters (using \) when executing a diff/diff3 command.
-(defun emerge-protect-metachars (s)
- (if (memq system-type '(ms-dos windows-nt))
- (shell-quote-argument s)
- (let ((limit 0))
- (while (string-match emerge-metachars s limit)
- (setq s (concat (substring s 0 (match-beginning 0))
- "\\"
- (substring s (match-beginning 0))))
- (setq limit (1+ (match-end 0)))))
- s))
+(make-obsolete-variable 'emerge-metachars nil "25.2")
(provide 'emerge)
- [Emacs-diffs] master updated (b593ea1 -> 37cef5f), Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 4dec928 2/7: Fix quoted lambda warning from lexical-let, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master a90d5e6 3/7: Error if --eval arg has text beyond 1 expression, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master ff40055 1/7: Make emerge always use shell-quote-argument,
Noam Postavsky <=
- [Emacs-diffs] master 031af49 4/7: Fix byte-compile of interactive closures, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 37cef5f 7/7: Make sh-mode always use p-s-lookup-properties, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 9ae89c2 5/7: Don't delete selection after indent-rigidly, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 0095837 6/7: Fix cl-assert with atomp FORM, non-nil SHOW-ARGS, Noam Postavsky, 2016/08/06