[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v |
Date: |
Mon, 23 Oct 2006 19:20:17 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 06/10/23 19:20:15
Index: lisp/ediff-mult.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- lisp/ediff-mult.el 25 Aug 2006 16:06:57 -0000 1.49
+++ lisp/ediff-mult.el 23 Oct 2006 19:20:15 -0000 1.50
@@ -1637,11 +1637,15 @@
(set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
(erase-buffer)
(shell-command
- (format "%s %s %s %s"
- ediff-custom-diff-program ediff-custom-diff-options
- (ediff-get-session-objA-name session)
- (ediff-get-session-objB-name session))
- t))
+ (format
+ "%s %s %s %s"
+ (shell-quote-argument ediff-custom-diff-program)
+ ediff-custom-diff-options
+ (shell-quote-argument (ediff-get-session-objA-name session))
+ (shell-quote-argument (ediff-get-session-objB-name session))
+ )
+ t)
+ )
(save-excursion
(set-buffer meta-diff-buff)
(goto-char (point-max))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,v,
Michael Kifer <=