Mercurial > emacs
comparison lisp/vc-sccs.el @ 49597:e88404e8f2cf
Trailing whitespace deleted.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 04 Feb 2003 12:29:42 +0000 |
parents | 9f461f463a94 |
children | b12a550504a4 d7ddb3e565de |
comparison
equal
deleted
inserted
replaced
49596:b06535145619 | 49597:e88404e8f2cf |
---|---|
3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: FSF (see vc.el for full credits) | 5 ;; Author: FSF (see vc.el for full credits) |
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
7 | 7 |
8 ;; $Id: vc-sccs.el,v 1.19 2002/11/13 12:37:58 spiegel Exp $ | 8 ;; $Id: vc-sccs.el,v 1.20 2002/12/26 14:07:15 spiegel Exp $ |
9 | 9 |
10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
26 | 26 |
27 ;;; Commentary: | 27 ;;; Commentary: |
28 | 28 |
29 ;;; Code: | 29 ;;; Code: |
30 | 30 |
31 (eval-when-compile | 31 (eval-when-compile |
32 (require 'vc)) | 32 (require 'vc)) |
33 | 33 |
34 ;;; | 34 ;;; |
35 ;;; Customization options | 35 ;;; Customization options |
36 ;;; | 36 ;;; |
37 | 37 |
38 (defcustom vc-sccs-register-switches nil | 38 (defcustom vc-sccs-register-switches nil |
39 "*Extra switches for registering a file in SCCS. | 39 "*Extra switches for registering a file in SCCS. |
240 (save-excursion | 240 (save-excursion |
241 ;; Adjust the default-directory so that the check-out creates | 241 ;; Adjust the default-directory so that the check-out creates |
242 ;; the file in the right place. | 242 ;; the file in the right place. |
243 (setq default-directory (file-name-directory file)) | 243 (setq default-directory (file-name-directory file)) |
244 | 244 |
245 (and rev (or (string= rev "") | 245 (and rev (or (string= rev "") |
246 (not (stringp rev))) | 246 (not (stringp rev))) |
247 (setq rev nil)) | 247 (setq rev nil)) |
248 (apply 'vc-do-command nil 0 "get" (vc-name file) | 248 (apply 'vc-do-command nil 0 "get" (vc-name file) |
249 (if editable "-e") | 249 (if editable "-e") |
250 (and rev (concat "-r" (vc-sccs-lookup-triple file rev))) | 250 (and rev (concat "-r" (vc-sccs-lookup-triple file rev))) |
292 | 292 |
293 (defun vc-sccs-diff (file &optional oldvers newvers) | 293 (defun vc-sccs-diff (file &optional oldvers newvers) |
294 "Get a difference report using SCCS between two versions of FILE." | 294 "Get a difference report using SCCS between two versions of FILE." |
295 (setq oldvers (vc-sccs-lookup-triple file oldvers)) | 295 (setq oldvers (vc-sccs-lookup-triple file oldvers)) |
296 (setq newvers (vc-sccs-lookup-triple file newvers)) | 296 (setq newvers (vc-sccs-lookup-triple file newvers)) |
297 (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file) | 297 (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file) |
298 (append (list "-q" | 298 (append (list "-q" |
299 (and oldvers (concat "-r" oldvers)) | 299 (and oldvers (concat "-r" oldvers)) |
300 (and newvers (concat "-r" newvers))) | 300 (and newvers (concat "-r" newvers))) |
301 (vc-diff-switches-list 'SCCS)))) | 301 (vc-diff-switches-list 'SCCS)))) |
302 | 302 |