/[emacs]/emacs/lisp/vc-mcvs.el
ViewVC logotype

Diff of /emacs/lisp/vc-mcvs.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.4 by monnier, Sun May 4 18:38:31 2003 UTC revision 1.5 by monnier, Thu May 8 18:25:09 2003 UTC
# Line 150  of a repository; then VC only stays loca Line 150  of a repository; then VC only stays loca
150           root))))           root))))
151    
152  (defun vc-mcvs-read (file)  (defun vc-mcvs-read (file)
153    (with-temp-buffer    (if (file-readable-p file)
154      (insert-file-contents file)        (with-temp-buffer
155      (goto-char (point-min))          (insert-file-contents file)
156      (read (current-buffer))))          (goto-char (point-min))
157            (read (current-buffer)))))
158    
159  (defun vc-mcvs-map-file (dir file)  (defun vc-mcvs-map-file (dir file)
160    (let ((map (vc-mcvs-read (expand-file-name "MCVS/MAP" dir)))    (let ((map (vc-mcvs-read (expand-file-name "MCVS/MAP" dir)))
# Line 485  The changes are between FIRST-VERSION an Line 486  The changes are between FIRST-VERSION an
486            ;; Note: this is NOT a "mcvs diff".            ;; Note: this is NOT a "mcvs diff".
487            (apply 'vc-do-command "*vc-diff*"            (apply 'vc-do-command "*vc-diff*"
488                   1 "diff" file                   1 "diff" file
489                   (append diff-switches-list '("/dev/null"))))                   (append diff-switches-list '("/dev/null")))
490              ;; Even if it's empty, it's locally modified.
491              1)
492        (setq status        (setq status
493              (apply 'vc-mcvs-command "*vc-diff*"              (apply 'vc-mcvs-command "*vc-diff*"
494                     (if (and (vc-mcvs-stay-local-p file)                     (if (and (vc-mcvs-stay-local-p file)

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26