Mercurial > emacs
changeset 82124:61db43184da9
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 26 Jul 2007 05:20:28 +0000 |
parents | 88083f9a3f28 (current diff) 9510a7231ed7 (diff) |
children | 5288b5374f65 |
files | lisp/vc-hg.el |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-hg.el Thu Jul 26 05:19:58 2007 +0000 +++ b/lisp/vc-hg.el Thu Jul 26 05:20:28 2007 +0000 @@ -9,7 +9,7 @@ ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -76,7 +76,7 @@ ;; - comment-history (file) NOT NEEDED ;; - update-changelog (files) NOT NEEDED ;; * 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,12 +303,12 @@ (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)) (defun vc-hg-diff-tree (file &optional oldvers newvers buffer) (vc-hg-diff (list file) oldvers newvers buffer))