Mercurial > emacs

changeset 96006:4a520700b8b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-diff-internal): Declare for compiler.
author Juanma Barranquero <lekktu@gmail.com>
date Mon, 16 Jun 2008 09:28:44 +0000
parents 66f0213be62a
children 8b2ac128dd5b
files lisp/ChangeLog lisp/log-view.el
diffstat 2 files changed, 19 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Jun 16 09:11:05 2008 +0000
+++ b/lisp/ChangeLog	Mon Jun 16 09:28:44 2008 +0000
@@ -1,5 +1,7 @@
 2008-06-16  Juanma Barranquero  <lekktu@gmail.com>
 
+	* log-view.el (vc-diff-internal): Declare for compiler.
+
 	* vc-bzr.el (log-view-per-file-logs):
 	* vc-svn.el (log-view-per-file-logs): Pacify byte compiler.
 
--- a/lisp/log-view.el	Mon Jun 16 09:11:05 2008 +0000
+++ b/lisp/log-view.el	Mon Jun 16 09:28:44 2008 +0000
@@ -50,33 +50,33 @@
 
 ;; ------------------------------------------------------------------------
 ;; r4622 | ckuethe | 2007-12-23 18:18:01 -0500 (Sun, 23 Dec 2007) | 2 lines
-;; 
+;;
 ;; uBlox AEK-4T in binary mode. Added to unstable because it breaks gpsfake
-;; 
+;;
 ;; ------------------------------------------------------------------------
 ;; r4621 | ckuethe | 2007-12-23 16:48:11 -0500 (Sun, 23 Dec 2007) | 3 lines
-;; 
+;;
 ;; Add a note about requiring usbfs to use the garmin gps18 (usb)
 ;; Mention firmware testing the AC12 with firmware BQ00 and BQ04
-;; 
+;;
 ;; ------------------------------------------------------------------------
 ;; r4620 | ckuethe | 2007-12-23 15:52:34 -0500 (Sun, 23 Dec 2007) | 1 line
-;; 
+;;
 ;; add link to latest hardware reference
 ;; ------------------------------------------------------------------------
 ;; r4619 | ckuethe | 2007-12-23 14:37:31 -0500 (Sun, 23 Dec 2007) | 1 line
-;; 
+;;
 ;; there is now a regression test for AC12 without raw data output
 
 ;;;; Darcs:
 
 ;; Changes to darcsum.el:
-;; 
+;;
 ;; Mon Nov 28 15:19:38 GMT 2005  Dave Love <fx@gnu.org>
 ;;   * Abstract process startup into darcsum-start-process.  Use TERM=dumb.
-;;   TERM=dumb avoids escape characters, at least, for any old darcs that 
+;;   TERM=dumb avoids escape characters, at least, for any old darcs that
 ;;   doesn't understand DARCS_DONT_COLOR & al.
-;; 
+;;
 ;; Thu Nov 24 15:20:45 GMT 2005  Dave Love <fx@gnu.org>
 ;;   * darcsum-mode-related changes.
 ;;   Don't call font-lock-mode (unnecessary) or use-local-map (redundant).
@@ -91,12 +91,12 @@
 ;; user:        Eric S. Raymond <esr@thyrsus.com>
 ;; date:        Wed Dec 26 12:18:58 2007 -0500
 ;; summary:     Explain keywords.  Add markup fixes.
-;; 
+;;
 ;; changeset:   10:20abc7ab09c3
 ;; user:        Eric S. Raymond <esr@thyrsus.com>
 ;; date:        Wed Dec 26 11:37:28 2007 -0500
 ;; summary:     Typo fixes.
-;; 
+;;
 ;; changeset:   9:ada9f4da88aa
 ;; user:        Eric S. Raymond <esr@thyrsus.com>
 ;; date:        Wed Dec 26 11:23:00 2007 -0500
@@ -250,9 +250,9 @@
   "Major mode for browsing CVS log output."
   (setq buffer-read-only t)
   (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults)
-  (set (make-local-variable 'beginning-of-defun-function) 
+  (set (make-local-variable 'beginning-of-defun-function)
        'log-view-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function) 
+  (set (make-local-variable 'end-of-defun-function)
        'log-view-end-of-defun)
   (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap))
 
@@ -451,7 +451,7 @@
 	     (forward-line 2))
 	    ((eq backend 'Hg)
 	     (forward-line 4)
-	     (re-search-forward "summary: *" nil t)))      
+	     (re-search-forward "summary: *" nil t)))
       (setq st (point))
       (buffer-substring st en))))
 
@@ -505,6 +505,9 @@
        log-view-vc-fileset)
        to fr)))
 
+(declare-function vc-diff-internal "vc"
+		  (async vc-fileset rev1 rev2 &optional verbose))
+
 (defun log-view-diff-changeset (beg end)
   "Get the diff between two revisions.
 If the mark is not active or the mark is on the revision at point,