[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118298: * lisp/vc/vc/git.el: Fix previous.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118298: * lisp/vc/vc/git.el: Fix previous. |
Date: |
Wed, 05 Nov 2014 23:12:16 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118298
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-11-05 18:12:07 -0500
message:
* lisp/vc/vc/git.el: Fix previous.
Move new code after vc-git-log-view-mode definition to avoid bootstrap error.
Ref: http://hydra.nixos.org/build/16795500
modified:
lisp/vc/vc-git.el vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070
=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2014-11-05 19:59:31 +0000
+++ b/lisp/vc/vc-git.el 2014-11-05 23:12:07 +0000
@@ -869,52 +869,6 @@
"@{upstream}"
remote-location))))
-(defun vc-git-region-history (file buffer lfrom lto)
- (vc-git-command buffer 'async nil "log" "-p" ;"--follow" ;FIXME: not
supported?
- (format "-L%d,%d:%s" lfrom lto (file-relative-name file))))
-
-(require 'diff-mode)
-
-(defvar vc-git-region-history-mode-map
- (let ((map (make-composed-keymap
- nil (make-composed-keymap
- (list diff-mode-map vc-git-log-view-mode-map)))))
- map))
-
-(defvar vc-git--log-view-long-font-lock-keywords nil)
-(defvar font-lock-keywords)
-(defvar vc-git-region-history-font-lock-keywords
- `((vc-git-region-history-font-lock)))
-
-(defun vc-git-region-history-font-lock (limit)
- (let ((in-diff (save-excursion
- (beginning-of-line)
- (or (looking-at "^\\(?:diff\\|commit\\)\\>")
- (re-search-backward "^\\(?:diff\\|commit\\)\\>" nil t))
- (eq ?d (char-after (match-beginning 0))))))
- (while
- (let ((end (save-excursion
- (if (re-search-forward "\n\\(diff\\|commit\\)\\>"
- limit t)
- (match-beginning 1)
- limit))))
- (let ((font-lock-keywords (if in-diff diff-font-lock-keywords
-
vc-git--log-view-long-font-lock-keywords)))
- (font-lock-fontify-keywords-region (point) end))
- (goto-char end)
- (prog1 (< (point) limit)
- (setq in-diff (eq ?d (char-after))))))
- nil))
-
-(define-derived-mode vc-git-region-history-mode
- vc-git-log-view-mode "Git-Region-History"
- "Major mode to browse Git's \"log -p\" output."
- (setq-local vc-git--log-view-long-font-lock-keywords
- log-view-font-lock-keywords)
- (setq-local font-lock-defaults
- (cons 'vc-git-region-history-font-lock-keywords
- (cdr font-lock-defaults))))
-
(defvar log-view-message-re)
(defvar log-view-file-re)
(defvar log-view-font-lock-keywords)
@@ -987,6 +941,54 @@
(indent-region (point-min) (point-max) 2)
(buffer-string))))
+
+(defun vc-git-region-history (file buffer lfrom lto)
+ (vc-git-command buffer 'async nil "log" "-p" ;"--follow" ;FIXME: not
supported?
+ (format "-L%d,%d:%s" lfrom lto (file-relative-name file))))
+
+(require 'diff-mode)
+
+(defvar vc-git-region-history-mode-map
+ (let ((map (make-composed-keymap
+ nil (make-composed-keymap
+ (list diff-mode-map vc-git-log-view-mode-map)))))
+ map))
+
+(defvar vc-git--log-view-long-font-lock-keywords nil)
+(defvar font-lock-keywords)
+(defvar vc-git-region-history-font-lock-keywords
+ `((vc-git-region-history-font-lock)))
+
+(defun vc-git-region-history-font-lock (limit)
+ (let ((in-diff (save-excursion
+ (beginning-of-line)
+ (or (looking-at "^\\(?:diff\\|commit\\)\\>")
+ (re-search-backward "^\\(?:diff\\|commit\\)\\>" nil t))
+ (eq ?d (char-after (match-beginning 0))))))
+ (while
+ (let ((end (save-excursion
+ (if (re-search-forward "\n\\(diff\\|commit\\)\\>"
+ limit t)
+ (match-beginning 1)
+ limit))))
+ (let ((font-lock-keywords (if in-diff diff-font-lock-keywords
+
vc-git--log-view-long-font-lock-keywords)))
+ (font-lock-fontify-keywords-region (point) end))
+ (goto-char end)
+ (prog1 (< (point) limit)
+ (setq in-diff (eq ?d (char-after))))))
+ nil))
+
+(define-derived-mode vc-git-region-history-mode
+ vc-git-log-view-mode "Git-Region-History"
+ "Major mode to browse Git's \"log -p\" output."
+ (setq-local vc-git--log-view-long-font-lock-keywords
+ log-view-font-lock-keywords)
+ (setq-local font-lock-defaults
+ (cons 'vc-git-region-history-font-lock-keywords
+ (cdr font-lock-defaults))))
+
+
(autoload 'vc-switches "vc")
(defun vc-git-diff (files &optional rev1 rev2 buffer)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118298: * lisp/vc/vc/git.el: Fix previous.,
Glenn Morris <=