diff options
| author | Glenn Morris | 2009-11-05 03:24:08 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-11-05 03:24:08 +0000 |
| commit | 881e4184a3d83b939559ba684a227eea67e17dd2 (patch) | |
| tree | ac3905cd5eadd129682146a9c54e8f627626ab99 | |
| parent | 60878f2df03bfe50956f8bb0648a06b06467b74f (diff) | |
| download | emacs-881e4184a3d83b939559ba684a227eea67e17dd2.tar.gz emacs-881e4184a3d83b939559ba684a227eea67e17dd2.zip | |
(vc-git-stash-map): Move definition before use.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-git.el | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9d0afea377..a36bbbbc508 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | * calendar/diary-lib.el (top-level): Make load behave more like require. | 8 | * calendar/diary-lib.el (top-level): Make load behave more like require. |
| 9 | 9 | ||
| 10 | * vc-git.el (vc-git-stash-map): Move definition before use. | ||
| 11 | |||
| 10 | 2009-11-04 Dan Nicolaescu <dann@ics.uci.edu> | 12 | 2009-11-04 Dan Nicolaescu <dann@ics.uci.edu> |
| 11 | 13 | ||
| 12 | * custom.el (custom-declare-group): Purecopy standard-value. | 14 | * custom.el (custom-declare-group): Purecopy standard-value. |
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index cee3abe0bb3..9f01a84cc81 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -399,6 +399,13 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 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 |
| @@ -831,13 +838,6 @@ This command shares argument histories with \\[rgrep] and \\[grep]." | |||
| 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 | ||