From: Miles Bader <miles@gnu.org>
Date: Thu, 26 Jul 2007 05:20:28 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~11712
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2bef61c9f13a78d19f759f5a5300351adc96df1d;p=emacs.git

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

2007-07-24  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/vc-hg.el (vc-hg-revision-completion-table): Temporarily comment out.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
---

2bef61c9f13a78d19f759f5a5300351adc96df1d
diff --cc lisp/vc-hg.el
index b4aa7d3a124,ea32c4a33b6..727aaf072e1
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@@ -75,8 -71,8 +75,8 @@@
  ;; - logentry-check ()                         NOT NEEDED
  ;; - comment-history (file)                    NOT NEEDED
  ;; - update-changelog (files)                  NOT NEEDED
 -;; * diff (file &optional rev1 rev2 buffer)    OK
 +;; * diff (files &optional rev1 rev2 buffer)   OK
- ;; - revision-completion-table (file)          OK
+ ;; - revision-completion-table (file)          COMMENTED OUT AS A WORKAROUND FOR A BUG
  ;; - diff-tree (dir &optional rev1 rev2)       TEST IT
  ;; - annotate-command (file buf &optional rev) OK
  ;; - annotate-time ()                          OK
@@@ -303,15 -292,14 +303,15 @@@
         (buffer-substring-no-properties (point-min) (point-max))))))
  
  ;; Modelled after the similar function in vc-cvs.el
- (defun vc-hg-revision-completion-table (file)
-   (lexical-let ((file file)
-                 table)
-     (setq table (lazy-completion-table
-                  table (lambda () (vc-hg-revision-table file))))
-     table))
+ ;; (defun vc-hg-revision-completion-table (file)
+ ;;   (lexical-let ((file file)
+ ;;                 table)
+ ;;     (setq table (lazy-completion-table
+ ;;                  table (lambda () (vc-hg-revision-table file))))
+ ;;     table))
  
 -(defalias 'vc-hg-diff-tree 'vc-hg-diff)
 +(defun vc-hg-diff-tree (file &optional oldvers newvers buffer)
 +  (vc-hg-diff (list file) oldvers newvers buffer))
  
  (defun vc-hg-annotate-command (file buffer &optional version)
    "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.