[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el [emacs-unicode-2] |
Date: |
Mon, 28 Jun 2004 04:34:00 -0400 |
Index: emacs/lisp/vc-hooks.el
diff -c emacs/lisp/vc-hooks.el:1.156.2.1 emacs/lisp/vc-hooks.el:1.156.2.2
*** emacs/lisp/vc-hooks.el:1.156.2.1 Fri Apr 16 12:50:10 2004
--- emacs/lisp/vc-hooks.el Mon Jun 28 07:28:47 2004
***************
*** 6,12 ****
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-hooks.el,v 1.156.2.1 2004/04/16 12:50:10 handa Exp $
;; This file is part of GNU Emacs.
--- 6,12 ----
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-hooks.el,v 1.156.2.2 2004/06/28 07:28:47 miles Exp $
;; This file is part of GNU Emacs.
***************
*** 44,51 ****
"set `vc-handled-backends' to nil to disable VC.")
(defvar vc-master-templates ())
! (make-obsolete-variable 'vc-master-templates
! "to define master templates for a given BACKEND, use
vc-BACKEND-master-templates. To enable or disable VC for a given
BACKEND, use `vc-handled-backends'.")
--- 44,51 ----
"set `vc-handled-backends' to nil to disable VC.")
(defvar vc-master-templates ())
! (make-obsolete-variable 'vc-master-templates
! "to define master templates for a given BACKEND, use
vc-BACKEND-master-templates. To enable or disable VC for a given
BACKEND, use `vc-handled-backends'.")
***************
*** 474,481 ****
(indirect-function
(vc-find-backend-function (vc-backend file)
'diff))))
! (not (eq (caddr err) 5)))
! (signal wrong-number-of-arguments err)
(vc-call diff file))))))
(defun vc-workfile-version (file)
--- 474,481 ----
(indirect-function
(vc-find-backend-function (vc-backend file)
'diff))))
! (not (eq (caddr err) 4)))
! (signal (car err) (cdr err))
(vc-call diff file))))))
(defun vc-workfile-version (file)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc-hooks.el [emacs-unicode-2],
Miles Bader <=