[Emacs-diffs] Changes to emacs/src/macmenu.c

[Steven Tamm]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.19 emacs/src/macmenu.c:1.20
*** emacs/src/macmenu.c:1.19    Thu Sep  2 17:00:36 2004
--- emacs/src/macmenu.c Wed Oct  6 15:38:53 2004
***************
*** 1322,1328 ****
  
    for (wv = first_wv; wv; wv = wv->next)
      {
!       if (wv->lname && ! NILP (wv->lname))
          {
            wv->name = SDATA (wv->lname);
  
--- 1322,1328 ----
  
    for (wv = first_wv; wv; wv = wv->next)
      {
!       if (STRINGP (wv->lname))
          {
            wv->name = SDATA (wv->lname);
  
***************
*** 1336,1342 ****
              }
          }
  
!       if (wv->lkey && ! NILP (wv->lkey))
          wv->key = SDATA (wv->lkey);
  
        if (wv->contents)
--- 1336,1342 ----
              }
          }
  
!       if (STRINGP (wv->lkey))
          wv->key = SDATA (wv->lkey);
  
        if (wv->contents)