emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: M-g in dired


From: Juri Linkov
Subject: Re: M-g in dired
Date: Tue, 01 Nov 2005 21:55:55 +0200
User-agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux)

> 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/





reply via email to

[Prev in Thread] Current Thread [Next in Thread]