Show
Ignore:
Timestamp:
04/07/07 15:49:28 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/erc/erc-menu.el

    r4190 r4200  
    11;; erc-menu.el -- Menu-bar definitions for ERC 
    22 
    3 ;; Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 
     3;; Copyright (C) 2001, 2002, 2004, 2005, 2006, 
     4;;   2007 Free Software Foundation, Inc. 
    45 
    56;; Author: Mario Lang <mlang@delysid.org> 
    …… 
    7677               ["Set a key..." erc-set-channel-key 
    7778                (erc-channel-user-op-p (erc-current-nick))]) 
    78          ["Leave this channel..." erc-part-from-channel erc-channel-users] 
    79         "-") 
     79         ["Leave this channel..." erc-part-from-channel erc-channel-users]) 
     80        "-" 
    8081        (list "Pals, fools and other keywords" 
    8182              ["Add pal..." erc-add-pal]