diff options
| author | K. Handa <handa@gnu.org> | 2015-09-02 18:28:54 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-09-02 18:28:54 +0900 |
| commit | e7b62736aade24620c8ba6fa6bd467d017f16ee0 (patch) | |
| tree | d00a2203437a168b2414c6b73afc00a88d90b4b1 /lisp/erc/erc.el | |
| parent | ae08d073d7e2738580341534adc3c5924dc76860 (diff) | |
| parent | 30866274e21c5f0a1c5f60cfe290743e7d482349 (diff) | |
| download | emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.tar.gz emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.tar.bz2 emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index f2821798103..726e9ed9a21 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -927,7 +927,7 @@ If no elements match, then the empty string is used. As an example: (setq erc-quit-reason-various-alist - '((\"xmms\" dme:now-playing) + \\='((\"xmms\" dme:now-playing) (\"version\" erc-quit-reason-normal) (\"home\" \"Gone home !\") (\"^$\" \"Default Reason\"))) @@ -950,7 +950,7 @@ If no elements match, then the empty string is used. As an example: (setq erc-part-reason-various-alist - '((\"xmms\" dme:now-playing) + \\='((\"xmms\" dme:now-playing) (\"version\" erc-part-reason-normal) (\"home\" \"Gone home !\") (\"^$\" \"Default Reason\"))) |