From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#11780: 24.1.50; vc-annotate fails for files in RCS. ("cl.el" `flet' problem?) Date: Tue, 26 Jun 2012 21:13:29 -0400 Message-ID: References: <83k3yv9qik.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1340759659 11113 80.91.229.3 (27 Jun 2012 01:14:19 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 27 Jun 2012 01:14:19 +0000 (UTC) Cc: Richard Copley , 11780@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 27 03:14:14 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SjgpX-0001Ac-Iv for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jun 2012 03:14:03 +0200 Original-Received: from localhost ([::1]:39488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjgpX-0003VY-Gu for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Jun 2012 21:14:03 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjgpV-0003V6-Cl for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 21:14:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SjgpT-0002sa-L5 for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 21:14:00 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjgpT-0002s8-Hb for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 21:13:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SjgtO-0005Sh-Fy for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 21:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jun 2012 01:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11780 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 11780-submit@debbugs.gnu.org id=B11780.134075985820963 (code B ref 11780); Wed, 27 Jun 2012 01:18:02 +0000 Original-Received: (at 11780) by debbugs.gnu.org; 27 Jun 2012 01:17:38 +0000 Original-Received: from localhost ([127.0.0.1]:59273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sjgsz-0005S2-C0 for submit@debbugs.gnu.org; Tue, 26 Jun 2012 21:17:37 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:51038) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sjgsx-0005Rv-Ko for 11780@debbugs.gnu.org; Tue, 26 Jun 2012 21:17:36 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Sjgp0-0001ms-2X; Tue, 26 Jun 2012 21:13:30 -0400 X-Spook: Mafia SDI government data haven Aldergrove ASDIC X-Ran: aHtx_Q/CS0_5N>?g'9q@Mf8+Eq^#0Q7PH;zmL&_OK*I7M(##Aeve*({mxQ%zQ7Z}U99pi, X-Hue: blue X-Attribution: GM In-Reply-To: (Stefan Monnier's message of "Tue, 26 Jun 2012 20:56:01 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:61319 Archived-At: Stefan Monnier wrote: > Does the patch below fix things? Well no, because there are multiple `flet's in the file and that's not the one giving the immediate error. Even if I replace every flet with cl-flet, it still fails. (void-function tok+val) in vc-rcs-parse when trying to define k-semi. Test case: (cl-flet ((f1 (a) (+ a 1)) (f2 (b) (+ (f1 b) 2))) (f2 1)) > --- lisp/vc/vc-rcs.el 2012-06-06 01:28:08 +0000 > +++ lisp/vc/vc-rcs.el 2012-06-27 00:52:54 +0000 > @@ -679,7 +679,7 @@ > ;; Apply reverse-chronological edits on the trunk, computing and > ;; accumulating forward-chronological edits after some point, for > ;; later. > - (flet ((r/d/a () (vector pre > + (cl-flet ((r/d/a () (vector pre > (cdr (assq 'date meta)) > (cdr (assq 'author meta))))) > (while (when (setq pre cur cur (cdr (assq 'next meta)))