From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#1386: 23.0.60; vc-git-diff: diff switches can't be customized Date: Fri, 21 Nov 2008 14:37:50 -0500 Message-ID: References: Reply-To: Glenn Morris , 1386@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1227297031 1334 80.91.229.12 (21 Nov 2008 19:50:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2008 19:50:31 +0000 (UTC) Cc: 1386@emacsbugs.donarmstrong.com To: Magnus Henoch Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 21 20:51:34 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1L3c2M-0007Wd-Sq for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 Nov 2008 20:51:31 +0100 Original-Received: from localhost ([127.0.0.1]:54817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3c1D-0004Wj-RR for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 Nov 2008 14:50:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3c1A-0004WH-2L for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2008 14:50:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3c17-0004W5-Lv for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2008 14:50:14 -0500 Original-Received: from [199.232.76.173] (port=42787 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3c17-0004W2-GG for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2008 14:50:13 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:34200) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L3c17-0004to-3I for bug-gnu-emacs@gnu.org; Fri, 21 Nov 2008 14:50:13 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mALJo9u9019198; Fri, 21 Nov 2008 11:50:09 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id mALJj25P017110; Fri, 21 Nov 2008 11:45:02 -0800 X-Loop: don@donarmstrong.com Resent-From: Glenn Morris Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 21 Nov 2008 19:45:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1386 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 1386-submit@emacsbugs.donarmstrong.com id=B1386.122729628615750 (code B ref 1386); Fri, 21 Nov 2008 19:45:02 +0000 Original-Received: (at 1386) by emacsbugs.donarmstrong.com; 21 Nov 2008 19:38:06 +0000 Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mALJc3mm015736 for <1386@emacsbugs.donarmstrong.com>; Fri, 21 Nov 2008 11:38:04 -0800 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L3bp8-00086v-MF; Fri, 21 Nov 2008 14:37:50 -0500 X-Spook: Zachawi Defcon undercover Leitrim Jyllandsposten X-Ran: J3xFr0qWQXp'PJ*w=;-Y0:LYoDZ1@9q}=DyIg-U2w'"]qi(r#n6({3zvzF6=ylpHvoO,-| X-Hue: cyan X-Attribution: GM In-Reply-To: (Magnus Henoch's message of "Sun, 01 Jun 2008 16:12:46 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Fri, 21 Nov 2008 14:50:14 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:22563 Archived-At: Magnus Henoch wrote: > I then found that vc-git-diff doesn't obey _any_ of diff-switches, > vc-diff-switches and vc-git-diff-switches, though the docstring of > vc-diff-switches implies that it would. Sorry for the long delay. Please try this patch. *** vc-git.el 27 Oct 2008 07:21:47 -0000 1.74 --- vc-git.el 21 Nov 2008 19:32:55 -0000 *************** *** 109,114 **** --- 109,127 ---- (require 'vc-dir) (require 'grep)) + (defcustom vc-git-diff-switches t + "String or list of strings specifying extra switches for Git diff under VC. + If nil, use the value of `vc-diff-switches'. + If you want to force an empty list of arguments, use t." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" + :value ("") + string)) + :version "23.1" + :group 'vc) + (defvar git-commits-coding-system 'utf-8 "Default coding system for git commits.") *************** *** 501,512 **** (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) ! (let ((buf (or buffer "*vc-diff*"))) ! (if (and rev1 rev2) ! (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" ! rev1 rev2 "--") ! (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" ! (or rev1 "HEAD") "--")))) (defun vc-git-revision-table (files) ;; What about `files'?!? --Stef --- 514,525 ---- (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) ! "Get a difference report using Git between two revisions of FILES." ! (apply #'vc-git-command (or buffer "*vc-diff*") 1 files ! (if (and rev1 rev2) "diff-tree" "diff-index") ! "--exit-code" ! (append (vc-switches (if vc-git-diff-switches 'git) 'diff) ! (list "-p" (or rev1 "HEAD") rev2 "--")))) (defun vc-git-revision-table (files) ;; What about `files'?!? --Stef