aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-12-03 07:35:14 +0000
committerGlenn Morris2008-12-03 07:35:14 +0000
commite98a0cab3fa886a18834d53d53f1807511d37630 (patch)
tree9879240084efe3f93e1ded301fc8451d142f0904
parent905ca9d2127e4f00ee2f936c22f98474a140000d (diff)
downloademacs-e98a0cab3fa886a18834d53d53f1807511d37630.tar.gz
emacs-e98a0cab3fa886a18834d53d53f1807511d37630.zip
(vc-arch-diff-switches): New option, for consistency with other backends.
(vc-arch-diff): Apply switches.
-rw-r--r--lisp/vc-arch.el19
1 files changed, 16 insertions, 3 deletions
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 8d1f862fb24..8bde884cdc2 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -1,6 +1,7 @@
1;;; vc-arch.el --- VC backend for the Arch version-control system 1;;; vc-arch.el --- VC backend for the Arch version-control system
2 2
3;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 3;; Copyright (C) 2004, 2005, 2006, 2007, 2008
4;; Free Software Foundation, Inc.
4 5
5;; Author: FSF (see vc.el for full credits) 6;; Author: FSF (see vc.el for full credits)
6;; Maintainer: Stefan Monnier <monnier@gnu.org> 7;; Maintainer: Stefan Monnier <monnier@gnu.org>
@@ -64,6 +65,19 @@
64;;; Customization options 65;;; Customization options
65;;; 66;;;
66 67
68;; It seems Arch diff does not accept many options, so this is not
69;; very useful. It exists mainly so that the VC backends are all
70;; consistent with regards to their treatment of diff switches.
71(defcustom vc-arch-diff-switches t
72 "String or list of strings specifying switches for Arch diff under VC.
73If nil, use the value of `vc-diff-switches'. If t, use no switches."
74 :type '(choice (const :tag "Unspecified" nil)
75 (const :tag "None" t)
76 (string :tag "Argument String")
77 (repeat :tag "Argument List" :value ("") string))
78 :version "23.1"
79 :group 'vc)
80
67(define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1") 81(define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1")
68 82
69(defcustom vc-arch-program 83(defcustom vc-arch-program
@@ -450,8 +464,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
450 (or buffer "*vc-diff*") 464 (or buffer "*vc-diff*")
451 (if async 'async 1) 465 (if async 'async 1)
452 nil "file-diffs" 466 nil "file-diffs"
453 ;; Arch does not support the typical flags. 467 (vc-switches 'Arch 'diff)
454 ;; (vc-switches 'Arch 'diff)
455 (file-relative-name file) 468 (file-relative-name file)
456 (if (equal oldvers (vc-working-revision file)) 469 (if (equal oldvers (vc-working-revision file))
457 nil 470 nil