# # patch "contrib/monotone.el" # from [4ec0114a82b28ab33376589c0ecff53a3db19763] # to [2918120ccd66757b31258124de532060f7e550da] # --- contrib/monotone.el +++ contrib/monotone.el @@ -5,8 +5,14 @@ ;; ;; Licence: GPL v2 (same as monotone) ;; Keymaps and other stuff added by address@hidden +;; ;;; Commentary: +;; To use monotone from within Emacs, decide what options you would +;; like and set the vars before loading 'monotone.el'. For example: +;; (setq monotone-passwd-remember t +;; monotone-vc-key [f5]) +;; (require 'monotone) ;; ;; This defines `monotone-diff', `monotone-status', `monotone-add', ;; `monotone-drop', `monotone-revert' and `monotone-commit'. These @@ -19,11 +25,6 @@ ;; /!\ beware of bugs: `monotone-commit' is more dangerous than the ;; others since it writes to the database. ;; -;; To use monotone from within Emacs, decide what options you would -;; like and set the vars before loading monotone.el -;; -;; (require 'monotone) -;; ;; FIXME: handle aborts better and kill monotone. @@ -45,7 +46,7 @@ ;; This is set to [f5] for testing. ;; Should be nil for general release, as we dont want to ;; remove keys without the users consent. -(defvar monotone-vc-key [f5] ;; "\C-xv" nil +(defvar monotone-vc-key nil ;; [f5] "\C-xv" nil "The prefix key to use for the monotone vc key map. You may wish to change this before loading monotone.el. Habitual monotone users can set it to '\C-xv'.") @@ -262,8 +263,8 @@ (let ((buf (get-buffer-create monotone-buffer))) (get-buffer-process buf)))) ;; (monotone-is-running) - + ;; (monotone-cmd "list" "branches") ;; (monotone-cmd "list" "keys") ;; (monotone-cmd "pubkey" "address@hidden")