From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier 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 20:56:01 -0400 Message-ID: References: <83k3yv9qik.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1340758627 4646 80.91.229.3 (27 Jun 2012 00:57:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 27 Jun 2012 00:57:07 +0000 (UTC) Cc: Richard Copley , 11780@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 27 02:57:06 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 1SjgZ6-0005OL-Q9 for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jun 2012 02:57:04 +0200 Original-Received: from localhost ([::1]:35497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjgZ6-0000e0-S1 for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Jun 2012 20:57:04 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjgZ3-0000db-R7 for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 20:57:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SjgZ1-0004Ew-Lh for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 20:57:01 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjgZ1-0004Em-Hu for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 20:56:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Sjgcw-00055i-DO for bug-gnu-emacs@gnu.org; Tue, 26 Jun 2012 21:01:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jun 2012 01:01: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.134075880919509 (code B ref 11780); Wed, 27 Jun 2012 01:01:02 +0000 Original-Received: (at 11780) by debbugs.gnu.org; 27 Jun 2012 01:00:09 +0000 Original-Received: from localhost ([127.0.0.1]:59264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sjgc4-00054b-Pe for submit@debbugs.gnu.org; Tue, 26 Jun 2012 21:00:09 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:45990) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sjgc3-00054V-EC for 11780@debbugs.gnu.org; Tue, 26 Jun 2012 21:00:07 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ai0FAG6Zu09sr+Nd/2dsb2JhbABEsEiDSYEIghUBAQQBViMFCwsOJhIUGA0kiBwFugmQRAOjM4FYgwU X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="192166662" Original-Received: from 108-175-227-93.dsl.teksavvy.com (HELO pastel.home) ([108.175.227.93]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 26 Jun 2012 20:56:02 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 6218A59042; Tue, 26 Jun 2012 20:56:01 -0400 (EDT) In-Reply-To: (Glenn Morris's message of "Tue, 26 Jun 2012 18:41:51 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) 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:61317 Archived-At: > So there's a couple of things wrong with the new version: > `x' used twice as a local variable. That's an illusion: these are two different uninterned symbols (of the same name). > (symbol-function 'sw) not guarded by an (fboundp 'sw) check. Indeed. > The latter is the immediate source of the error AFAICS. Does the patch below fix things? Stefan === modified file 'lisp/vc/vc-rcs.el' --- 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)))