Mercurial > emacs

comparison lisp/vc-git.el @ 105860:78f37cce705f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-git-stash-map): Move definition before use.
author Glenn Morris <rgm@gnu.org>
date Thu, 05 Nov 2009 03:24:08 +0000
parents 6f463ea7a91a
children 2bed02fa3041
comparison
equal deleted inserted replaced
105859:658336850f93 105860:78f37cce705f
397 397
398 (defun vc-git-dir-status-files (dir files default-state update-function) 398 (defun vc-git-dir-status-files (dir files default-state update-function)
399 "Return a list of (FILE STATE EXTRA) entries for FILES in DIR." 399 "Return a list of (FILE STATE EXTRA) entries for FILES in DIR."
400 (vc-git-dir-status-goto-stage 'update-index files update-function)) 400 (vc-git-dir-status-goto-stage 'update-index files update-function))
401 401
402 (defvar vc-git-stash-map
403 (let ((map (make-sparse-keymap)))
404 (define-key map "\C-k" 'vc-git-stash-delete-at-point)
405 (define-key map "=" 'vc-git-stash-show-at-point)
406 (define-key map "\C-m" 'vc-git-stash-show-at-point)
407 map))
408
402 (defun vc-git-dir-extra-headers (dir) 409 (defun vc-git-dir-extra-headers (dir)
403 (let ((str (with-output-to-string 410 (let ((str (with-output-to-string
404 (with-current-buffer standard-output 411 (with-current-buffer standard-output
405 (vc-git--out-ok "symbolic-ref" "HEAD")))) 412 (vc-git--out-ok "symbolic-ref" "HEAD"))))
406 (stash (vc-git-stash-list)) 413 (stash (vc-git-stash-list))
829 836
830 (defun vc-git-stash-show-at-point () 837 (defun vc-git-stash-show-at-point ()
831 (interactive) 838 (interactive)
832 (vc-git-stash-show (format "stash@%s" (vc-git-stash-get-at-point (point))))) 839 (vc-git-stash-show (format "stash@%s" (vc-git-stash-get-at-point (point)))))
833 840
834 (defvar vc-git-stash-map
835 (let ((map (make-sparse-keymap)))
836 (define-key map "\C-k" 'vc-git-stash-delete-at-point)
837 (define-key map "=" 'vc-git-stash-show-at-point)
838 (define-key map "\C-m" 'vc-git-stash-show-at-point)
839 map))
840
841 841
842 ;;; Internal commands 842 ;;; Internal commands
843 843
844 (defun vc-git-command (buffer okstatus file-or-list &rest flags) 844 (defun vc-git-command (buffer okstatus file-or-list &rest flags)
845 "A wrapper around `vc-do-command' for use in vc-git.el. 845 "A wrapper around `vc-do-command' for use in vc-git.el.