Please change the Subject header to a concise description of your patch. Please describe your patch between the LOG-START and LOG-END markers: <<LOG-START>> * lisp/xgit-annotate.el (xgit-annotate-font-lock-keywords) (xgit-info-to-allbutlinenum, xgit-annotate-revision-regexp) (xgit-annotate-show-rev): Use "\\s" instead of "\s" and "^" instead of "^^?" and "^^". (_xgit-annotate-hide-revinfo): Pass 1 to `previous-line' for Emacs21 compatibility.
* lisp/xgit.el (xgit-annotate): Use `dvc-line-number-at-pos' instead of
`line-number-at-pos'.
* lisp/xhg-mq.el (xhg-mq-ewoc-data-at-point): Use
`dvc-line-number-at-pos' instead of `line-number-at-pos'.
<<LOG-END>>
[VERSION] dvc-dev-bzr
Bazaar (bzr) 0.16.0
Emacs : GNU Emacs 22.1.50.1 (i686-pc-linux-gnu, GTK+ Version 2.10.12)
of 2007-05-29 on hariken
--
Michael Olson -- FSF Associate Member #652 |
http://mwolson.org/ -- Jabber: mwolson_at_hcoop.net | /` |\ | | |
Sysadmin -- Hobbies: Lisp, GP2X, HCoop | |_] | \| |_|
Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
pgpZxDzKsmqEe.pgp
Description: PGP signature
=== modified file 'lisp/xgit-annotate.el'
--- lisp/xgit-annotate.el 2007-06-04 14:26:22 +0000
+++ lisp/xgit-annotate.el 2007-06-10 07:06:46 +0000
@@ -27,9 +27,9 @@
(require 'dvc-annotate)
(defvar xgit-annotate-font-lock-keywords
- '(("^[[:xdigit:]]\\{40\\}\s[[:digit:]]+\s[[:digit:]]+\s[[:digit:]]+" . font-lock-keyword-face)
- ("^[[:xdigit:]]\\{40\\}\s[[:digit:]]+\s[[:digit:]]+" . font-lock-string-face)
- ("^^[[:xdigit:]]\\{7\\}" . font-lock-string-face)
+ '(("^[[:xdigit:]]\\{40\\}\\s[[:digit:]]+\\s[[:digit:]]+\\s[[:digit:]]+" . font-lock-keyword-face)
+ ("^[[:xdigit:]]\\{40\\}\\s[[:digit:]]+\\s[[:digit:]]+" . font-lock-string-face)
+ ("^[[:xdigit:]]\\{7\\}" . font-lock-string-face)
("^[[:xdigit:]]\\{8\\}" . font-lock-function-name-face)
("^author\\(-mail\\|-time\\|-tz\\)?" . font-lock-function-name-face)
("^committer\\(-mail\\|-time\\|-tz\\)?" . font-lock-function-name-face)
@@ -66,7 +66,7 @@
;; "^de398cf (Takuzo Ohara 2007-02-21 21:28:35 +0900 366) ..."
;; or not yet commited:
;; "00000000 (Not Committed Yet 2007-02-24 15:31:42 +0900 37) ..."
-(defconst xgit-annotate-info-regexp "^\\(\\(\\^?\\([[:xdigit:]]+\\)\\)\s+(\\(.*?\\)\s+\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\) \\([+-][0-9]\\{2\\}\\)\\([0-9]\\{2\\}\\)\s+\\)\\([0-9]+\\))")
+(defconst xgit-annotate-info-regexp "^\\(\\(\\^?\\([[:xdigit:]]+\\)\\)\\s+(\\(.*?\\)\\s+\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\) \\([+-][0-9]\\{2\\}\\)\\([0-9]\\{2\\}\\)\\s+\\)\\([0-9]+\\))")
(defun xgit-info-to-allbutlinenum () (match-string-no-properties 1))
(defun xgit-info-to-rev () (match-string-no-properties 2))
(defun xgit-info-to-initrev () (match-string-no-properties 3))
@@ -81,7 +81,7 @@
(defun xgit-info-to-zone-min () (string-to-number (match-string-no-properties 12)))
(defun xgit-info-to-linenum () (string-to-number (match-string-no-properties 13)))
-(defconst xgit-annotate-revision-regexp "^^?[[:xdigit:]]+")
+(defconst xgit-annotate-revision-regexp "^[[:xdigit:]]+")
(defun xgit-annotate-get-rev ()
"Returns git revision at point in annotate buffer."
@@ -96,7 +96,7 @@
"Show the information at the point."
(interactive)
(let ((rev (xgit-annotate-get-rev)))
- (if (string-match "^^\\([[:xdigit:]]+\\)" rev)
+ (if (string-match "^\\([[:xdigit:]]+\\)" rev)
;initial version might result too large for git-show, so use
;git-log.
(git-log default-directory :rev (match-string-no-properties 1 rev))
@@ -114,7 +114,7 @@
(while (string= p_rev (xgit-annotate-get-rev))
(forward-line 1))
;; point is at new revision so move back a line,
- (previous-line)
+ (previous-line 1)
;; match again to get position of right-bottom corner,
(xgit-annotate-get-rev)
;; rectangular replace by white space, from start to end.
=== modified file 'lisp/xgit.el'
--- lisp/xgit.el 2007-06-03 12:56:28 +0000
+++ lisp/xgit.el 2007-06-10 07:06:46 +0000
@@ -403,7 +403,7 @@
(defun xgit-annotate ()
"Run git annotate"
(interactive)
- (let* ((line (line-number-at-pos))
+ (let* ((line (dvc-line-number-at-pos))
(filename (dvc-confirm-read-file-name "Filename to annotate: "))
(default-directory (xgit-tree-root filename)))
(git-annotate default-directory filename)
=== modified file 'lisp/xhg-mq.el'
--- lisp/xhg-mq.el 2007-03-21 20:48:32 +0000
+++ lisp/xhg-mq.el 2007-06-10 07:06:46 +0000
@@ -426,7 +426,7 @@
(toggle-read-only 1))
(defun xhg-mq-ewoc-data-at-point ()
- (if (or (= (line-number-at-pos) 1) (eq (line-beginning-position) (line-end-position)) (not (eq major-mode 'xhg-mq-mode)))
+ (if (or (= (dvc-line-number-at-pos) 1) (eq (line-beginning-position) (line-end-position)) (not (eq major-mode 'xhg-mq-mode)))
nil
(ewoc-data (ewoc-locate xhg-mq-cookie))))
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
