[nongnu] elpa/vc-fossil 4e95c73 094/111: Merged.

[ELPA Syncer]

branch: elpa/vc-fossil
commit 4e95c731c7ac02593dbb8bd057034ebaab89281d
Merge: 73c5145 d03f490
Author: pdo <pdo>
Commit: pdo <pdo>

    Merged.
---
 doc/index.wiki     | 53 ++++++++++++++++++++++++++++++++++-------------------
 vc/el/vc-fossil.el |  7 +++++++
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/doc/index.wiki b/doc/index.wiki
index ad6c3d5..40a13c5 100644
--- a/doc/index.wiki
+++ b/doc/index.wiki
@@ -1,15 +1,23 @@
 <title>Emacs Integration for Fossil</title>
 
-This mini-project is for integrating emacs into fossil.  This needs a
-few changes into fossil and needs a new file to be loaded into emacs.
+This project is for integrating fossil (http://fossil-scm.org/) into
+emacs (https://www.gnu.org/software/emacs/) vc-mode.
 
-You need emacs version 23.1 or better.  This definitely does not work
-with versions 22.*.
+You need emacs version 24.1 or better.  23.* is not supported anymore.
 
 <h4>How Do I load Fossil support into emacs?</h4>
 
 Short answer:
 
+Install the vc-fossil package from the MELPA package repository then
+customize the vc-handled-backend variable by adding "Fossil" to its
+list of names.
+
+Alternative, slightly longer, answer:
+
+Instead of installing from MELPA you may clone this source repository
+directly then add it manually to your Emacs setup as follows.
+
 Add this to your .emacs file, or cut and paste this into the *scratch*
 buffer and do
 <code>C-x C-e</code> to execute it.
@@ -31,21 +39,6 @@ emacs -batch -q -no-site-file -eval '(byte-compile-file 
"vc-fossil.el")'
 </pre>
 then you can load vc-fossil.elc, which should be nominally faster.
 
-<h4>What changes to fossil are required</h4>
-
-As of this fossil version:
-
-<pre>
-7d2d1d3228232b1a1434e425f11008c043171263 2010-11-09 17:51:35 UTC
-</pre>
-
-Fossil trunk (and therefore binaries after that date) support
-this package directly.
-
-Future changes, if required, will be in the venks-emacs branch on the
-fossil repository.
-
-
 <h4>What emacs keys do I need?</h4>
 
 This integrates fossil into emacs vc builtin mode.  The same keys will
@@ -60,3 +53,25 @@ A few are:
 </table>
 
 </table>
+
+<h4>Credits</h4>
+
+Over the years many folks have helped me (Venkat Iyer,
+venkat@comit.com) with building and improving emacs-fossil.  Notable
+are:
+
+<ul>
+  <li>Barak A. Pearlmutter, barak pearlmutter net :
+    Major cleanup of my initial versions</li>
+  <li>Frank Fisher, frank-fischer shadow-soft  de :
+    colorized logs, annotate, a few fixes for the diff</li>
+  <li>Paul Onions, ponions37 gmail com :
+    emacs 25 support</li>
+</ul>
+    
+<h4>Mirrors</h4>
+
+This project is also mirrored into github at
+https://github.com/venks1/emacs-fossil , primarily for MELPA.
+
+
diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index f99a174..7c92165 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -22,6 +22,11 @@
 
 ;;; Installation:
 
+;; 1. Install this vc-fossil package.
+;; 2. Add "Fossil" to the list of VC backends using
+;;    M-x customize-variable vc-handled-backends
+
+;; Alternative manual installation
 ;; 1. Put this file somewhere in the Emacs load-path.
 ;; 2. Tell Emacs to load it when needed:
 ;;    (autoload 'vc-fossil-registered "vc-fossil")
@@ -259,6 +264,8 @@ If `files` is nil return the status for all files."
   (concat (propertize name  'face 'font-lock-type-face)
           (propertize value 'face 'font-lock-variable-name-face)))
 
+(defun vc-fossil-checkout-model (files) 'implicit)
+
 (defun vc-fossil-dir-extra-headers (dir)
   (let ((info (vc-fossil--run "info"))
         (settings (vc-fossil--run "settings"))