From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: M-g in dired Date: Tue, 01 Nov 2005 21:55:55 +0200 Organization: JURTA Message-ID: <87br14kur8.fsf@jurta.org> References: <873bnf36mr.fsf@jurta.org> <878xwap86u.fsf@jurta.org> <8764rcye8k.fsf@jurta.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1130875373 23197 80.91.229.2 (1 Nov 2005 20:02:53 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 1 Nov 2005 20:02:53 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 01 21:02:50 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EX2Jl-0004oC-Be for ged-emacs-devel@m.gmane.org; Tue, 01 Nov 2005 21:01:13 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EX2Jk-0001wf-Pe for ged-emacs-devel@m.gmane.org; Tue, 01 Nov 2005 15:01:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EX2Jb-0001wY-7L for emacs-devel@gnu.org; Tue, 01 Nov 2005 15:01:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EX2Ja-0001wL-MO for emacs-devel@gnu.org; Tue, 01 Nov 2005 15:01:03 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EX2Ja-0001wI-Ij for emacs-devel@gnu.org; Tue, 01 Nov 2005 15:01:02 -0500 Original-Received: from [194.126.101.111] (helo=mail.neti.ee) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EX2JJ-0007y3-4X; Tue, 01 Nov 2005 15:00:45 -0500 Original-Received: from mail.neti.ee (80-235-38-199-dsl.mus.estpak.ee [80.235.38.199]) by Relayhost1.neti.ee (Postfix) with ESMTP id 927DC1BC2; Tue, 1 Nov 2005 22:00:53 +0200 (EET) Original-To: Andreas Schwab In-Reply-To: (Andreas Schwab's message of "Tue, 01 Nov 2005 15:09:07 +0100") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) X-Virus-Scanned: by amavisd-new-2.2.1 (20041222) (Debian) at neti.ee X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:45262 Archived-At: > You still have to use RETURN_UNGCPRO here to undo the GCPRO. Thanks. Here is the correct patch: Index: src/keymap.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/keymap.c,v retrieving revision 1.307 diff -c -r1.307 keymap.c *** src/keymap.c 12 Sep 2005 10:26:35 -0000 1.307 --- src/keymap.c 1 Nov 2005 19:55:45 -0000 *************** *** 1262,1269 **** keymap = get_keymap (cmd, 0, 1); if (!CONSP (keymap)) ! RETURN_UNGCPRO (make_number (idx)); ! QUIT; } } --- 1262,1273 ---- keymap = get_keymap (cmd, 0, 1); if (!CONSP (keymap)) ! { ! if (!NILP (cmd)) ! RETURN_UNGCPRO (make_number (idx)); ! else ! RETURN_UNGCPRO (Qnil); ! } QUIT; } } *************** *** 2377,2383 **** for (tail = shadow; CONSP (tail); tail = XCDR (tail)) { value = Flookup_key (XCAR (tail), key, flag); ! if (!NILP (value) && !NATNUMP (value)) return value; } return Qnil; --- 2381,2389 ---- for (tail = shadow; CONSP (tail); tail = XCDR (tail)) { value = Flookup_key (XCAR (tail), key, flag); ! if (NATNUMP (value)) ! return Qnil; ! if (!NILP (value)) return value; } return Qnil; -- Juri Linkov http://www.jurta.org/emacs/