procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
bed04c502c Use correct registry name for windows-1251 charset
1aa1529301 ERC: Update maintainer address
This commit is contained in:
Glenn Morris 2020-03-23 09:46:39 -07:00
commit d5cfc4ac8b
36 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/erc/erc-autoaway.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <forcer@forcix.cx>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcAutoAway
;; This file is part of GNU Emacs.

2
lisp/erc/erc-backend.el
View file

@ -4,7 +4,7 @@
;; Filename: erc-backend.el
;; Author: Lawrence Mitchell <wence@gmx.li>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Created: 2004-05-7
;; Keywords: IRC chat client internet

2
lisp/erc/erc-button.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 1996-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: irc, button, url, regexp
;; URL: https://www.emacswiki.org/emacs/ErcButton

2
lisp/erc/erc-capab.el
View file

@ -2,7 +2,7 @@
;; Copyright (C) 2006-2020 Free Software Foundation, Inc.
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
; This file is part of GNU Emacs.

2
lisp/erc/erc-compat.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ERC
;; This file is part of GNU Emacs.

2
lisp/erc/erc-dcc.el
View file

@ -6,7 +6,7 @@
;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
;; Noah Friedman <friedman@prep.ai.mit.edu>
;; Per Persson <pp@sno.pp.se>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, processes
;; Created: 1994-01-23

2
lisp/erc/erc-desktop-notifications.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2012-2020 Free Software Foundation, Inc.
;; Author: Julien Danjou <julien@danjou.info>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; This file is part of GNU Emacs.

2
lisp/erc/erc-ezbounce.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <asf@void.at>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; This file is part of GNU Emacs.

2
lisp/erc/erc-fill.el
View file

@ -4,7 +4,7 @@
;; Author: Andreas Fuchs <asf@void.at>
;; Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcFilling
;; This file is part of GNU Emacs.

2
lisp/erc/erc-goodies.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2001-2020 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <forcer@forcix.cx>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Most code is taken verbatim from erc.el, see there for the original
;; authors.

2
lisp/erc/erc-ibuffer.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; This file is part of GNU Emacs.

2
lisp/erc/erc-identd.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2003, 2006-2020 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, processes
;; This file is part of GNU Emacs.

2
lisp/erc/erc-imenu.el
View file

@ -4,7 +4,7 @@
;; Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; URL: https://www.emacswiki.org/emacs/ErcImenu

2
lisp/erc/erc-join.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: irc
;; URL: https://www.emacswiki.org/emacs/ErcAutoJoin

2
lisp/erc/erc-lang.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Old-Version: 1.0.0
;; URL: https://www.emacswiki.org/emacs/ErcLang
;; Keywords: comm languages processes

2
lisp/erc/erc-list.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2008-2020 Free Software Foundation, Inc.
;; Author: Tom Tromey <tromey@redhat.com>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Old-Version: 0.1
;; URL: https://www.emacswiki.org/emacs/ErcList
;; Keywords: comm

2
lisp/erc/erc-log.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2003-2020 Free Software Foundation, Inc.
;; Author: Lawrence Mitchell <wence@gmx.li>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcLogging
;; Keywords: IRC, chat, client, Internet, logging

2
lisp/erc/erc-match.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2020 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <asf@void.at>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, faces
;; URL: https://www.emacswiki.org/emacs/ErcMatch

2
lisp/erc/erc-menu.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2001-2002, 2004-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, processes, menu
;; This file is part of GNU Emacs.

2
lisp/erc/erc-netsplit.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; This file is part of GNU Emacs.

2
lisp/erc/erc-networks.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@lexx.delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; This file is part of GNU Emacs.

2
lisp/erc/erc-notify.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@lexx.delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcNotify
;; Keywords: comm

2
lisp/erc/erc-page.el
View file

@ -2,7 +2,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; This file is part of GNU Emacs.

2
lisp/erc/erc-pcomplete.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Sacha Chua <sacha@free.net.ph>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, convenience
;; URL: https://www.emacswiki.org/emacs/ErcCompletion

2
lisp/erc/erc-replace.el
View file

@ -4,7 +4,7 @@
;; Inc.
;; Author: Andreas Fuchs <asf@void.at>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcReplace
;; Keywords: IRC, client, Internet

2
lisp/erc/erc-ring.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm
;; URL: https://www.emacswiki.org/emacs/ErcHistory

2
lisp/erc/erc-services.el
View file

@ -2,7 +2,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcNickserv
;; This file is part of GNU Emacs.

2
lisp/erc/erc-sound.el
View file

@ -2,7 +2,7 @@
;; Copyright (C) 2002-2003, 2006-2020 Free Software Foundation, Inc.
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcSound
;; This file is part of GNU Emacs.

2
lisp/erc/erc-speedbar.el
View file

@ -4,7 +4,7 @@
;; Author: Mario Lang <mlang@delysid.org>
;; Contributor: Eric M. Ludlam <zappo@gnu.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcSpeedbar
;; This file is part of GNU Emacs.

2
lisp/erc/erc-spelling.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2005-2020 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <forcer@forcix.cx>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: irc
;; URL: https://www.emacswiki.org/emacs/ErcSpelling

2
lisp/erc/erc-stamp.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, processes, timestamp
;; URL: https://www.emacswiki.org/emacs/ErcStamp

2
lisp/erc/erc-track.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2002-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, faces
;; URL: https://www.emacswiki.org/emacs/ErcChannelTracking

2
lisp/erc/erc-truncate.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <asf@void.at>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; URL: https://www.emacswiki.org/emacs/ErcTruncation
;; Keywords: IRC, chat, client, Internet, logging

2
lisp/erc/erc-xdcc.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: comm, processes
;; This file is part of GNU Emacs.

2
lisp/erc/erc.el
View file

@ -10,7 +10,7 @@
;; Gergely Nagy (algernon@midgard.debian.net)
;; David Edmondson (dme@dme.org)
;; Kelvin White (kwhite@gnu.org)
;; Maintainer: Amin Bandali <mab@gnu.org>
;; Maintainer: Amin Bandali <bandali@gnu.org>
;; Keywords: IRC, chat, client, Internet
;; Version: 5.3

2
src/ftfont.c
View file

@ -119,7 +119,7 @@ static struct
{ "jisx0213.2004-1", { 0x20B9F }},
{ "viscii1.1-1", { 0x1EA0, 0x1EAE, 0x1ED2 }, "vi"},
{ "tis620.2529-1", { 0x0E01 }, "th"},
{ "windows-1251", { 0x0401, 0x0490 }, "ru"},
{ "microsoft-cp1251", { 0x0401, 0x0490 }, "ru"},
{ "koi8-r", { 0x0401, 0x2219 }, "ru"},
{ "mulelao-1", { 0x0E81 }, "lo"},
{ "unicode-sip", { 0x20000 }},