[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d5cfc4a 1/3: Merge from origin/emacs-27
|
From: |
Glenn Morris |
|
Subject: |
master d5cfc4a 1/3: Merge from origin/emacs-27 |
|
Date: |
Mon, 23 Mar 2020 12:48:27 -0400 (EDT) |
branch: master
commit d5cfc4ac8bd25ec43864af4b8d10fff643fb47bd
Merge: 8f69483 bed04c5
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-27
bed04c502c Use correct registry name for windows-1251 charset
1aa1529301 ERC: Update maintainer address
---
lisp/erc/erc-autoaway.el | 2 +-
lisp/erc/erc-backend.el | 2 +-
lisp/erc/erc-button.el | 2 +-
lisp/erc/erc-capab.el | 2 +-
lisp/erc/erc-compat.el | 2 +-
lisp/erc/erc-dcc.el | 2 +-
lisp/erc/erc-desktop-notifications.el | 2 +-
lisp/erc/erc-ezbounce.el | 2 +-
lisp/erc/erc-fill.el | 2 +-
lisp/erc/erc-goodies.el | 2 +-
lisp/erc/erc-ibuffer.el | 2 +-
lisp/erc/erc-identd.el | 2 +-
lisp/erc/erc-imenu.el | 2 +-
lisp/erc/erc-join.el | 2 +-
lisp/erc/erc-lang.el | 2 +-
lisp/erc/erc-list.el | 2 +-
lisp/erc/erc-log.el | 2 +-
lisp/erc/erc-match.el | 2 +-
lisp/erc/erc-menu.el | 2 +-
lisp/erc/erc-netsplit.el | 2 +-
lisp/erc/erc-networks.el | 2 +-
lisp/erc/erc-notify.el | 2 +-
lisp/erc/erc-page.el | 2 +-
lisp/erc/erc-pcomplete.el | 2 +-
lisp/erc/erc-replace.el | 2 +-
lisp/erc/erc-ring.el | 2 +-
lisp/erc/erc-services.el | 2 +-
lisp/erc/erc-sound.el | 2 +-
lisp/erc/erc-speedbar.el | 2 +-
lisp/erc/erc-spelling.el | 2 +-
lisp/erc/erc-stamp.el | 2 +-
lisp/erc/erc-track.el | 2 +-
lisp/erc/erc-truncate.el | 2 +-
lisp/erc/erc-xdcc.el | 2 +-
lisp/erc/erc.el | 2 +-
src/ftfont.c | 2 +-
36 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index be7baca..0950cec 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcAutoAway
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index b1a829c..57c8e73 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,7 +4,7 @@
;; Filename: erc-backend.el
;; Author: Lawrence Mitchell <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Created: 2004-05-7
;; Keywords: IRC chat client internet
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index cb1b71b..5e6f7c8 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -3,7 +3,7 @@
;; Copyright (C) 1996-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: irc, button, url, regexp
;; URL: https://www.emacswiki.org/emacs/ErcButton
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index 129f502..fc45725 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2006-2020 Free Software Foundation, Inc.
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index f433abc..c77d5ab 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ERC
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index e121003..26701ce 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,7 +6,7 @@
;; Author: Ben A. Mesander <address@hidden>
;; Noah Friedman <address@hidden>
;; Per Persson <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, processes
;; Created: 1994-01-23
diff --git a/lisp/erc/erc-desktop-notifications.el
b/lisp/erc/erc-desktop-notifications.el
index 7c32429..1e65f8f 100644
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2012-2020 Free Software Foundation, Inc.
;; Author: Julien Danjou <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index a2d58e9..5c2faff 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 6abbe39..39a8be5 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,7 +4,7 @@
;; Author: Andreas Fuchs <address@hidden>
;; Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcFilling
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 809f8f0..94d5de2 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2001-2020 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Most code is taken verbatim from erc.el, see there for the original
;; authors.
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 7a04ff1..7aee770 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 70a0917..e2115f5 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2003, 2006-2020 Free Software Foundation, Inc.
;; Author: John Wiegley <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 3fb91ec..c05633a 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -4,7 +4,7 @@
;; Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; URL: https://www.emacswiki.org/emacs/ErcImenu
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 7bc4f00..280d6bf 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: irc
;; URL: https://www.emacswiki.org/emacs/ErcAutoJoin
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 3ab1f03..95b94f6 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Old-Version: 1.0.0
;; URL: https://www.emacswiki.org/emacs/ErcLang
;; Keywords: comm languages processes
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 4fba9f4..5faeabb 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2008-2020 Free Software Foundation, Inc.
;; Author: Tom Tromey <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Old-Version: 0.1
;; URL: https://www.emacswiki.org/emacs/ErcList
;; Keywords: comm
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index e53f3c0..1bad6d1 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2003-2020 Free Software Foundation, Inc.
;; Author: Lawrence Mitchell <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcLogging
;; Keywords: IRC, chat, client, Internet, logging
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index c0f3bf1..3107ff2 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2020 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, faces
;; URL: https://www.emacswiki.org/emacs/ErcMatch
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 4bc758a..9c02899 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2001-2002, 2004-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, processes, menu
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 2816acd..e3dc52b 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index 0696993..1234962 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2004-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 80ae0c3..1b092c8 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcNotify
;; Keywords: comm
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index c6eca51..339beb0 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2002, 2004, 2006-2020 Free Software Foundation, Inc.
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 65b0f66..7643fa8 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Sacha Chua <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, convenience
;; URL: https://www.emacswiki.org/emacs/ErcCompletion
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index dfb2062..8bd97be 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -4,7 +4,7 @@
;; Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcReplace
;; Keywords: IRC, client, Internet
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 7594b8e..bc5f0ed 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm
;; URL: https://www.emacswiki.org/emacs/ErcHistory
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 2d1d855..c0011f9 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcNickserv
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 96d41a6..91ce1c6 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2002-2003, 2006-2020 Free Software Foundation, Inc.
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcSound
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 1c0635c..b64e42b 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,7 +4,7 @@
;; Author: Mario Lang <address@hidden>
;; Contributor: Eric M. Ludlam <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcSpeedbar
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 4632329..cedffbc 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2005-2020 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: irc
;; URL: https://www.emacswiki.org/emacs/ErcSpelling
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 3717dc0..cbab2f9 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, processes, timestamp
;; URL: https://www.emacswiki.org/emacs/ErcStamp
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index f8c80d2..db8ccbb 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, faces
;; URL: https://www.emacswiki.org/emacs/ErcChannelTracking
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 9de33ff..fff073a 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Andreas Fuchs <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; URL: https://www.emacswiki.org/emacs/ErcTruncation
;; Keywords: IRC, chat, client, Internet, logging
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 61087de..2a236d2 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc.
;; Author: Mario Lang <address@hidden>
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: comm, processes
;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 81325df..5c63382 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -10,7 +10,7 @@
;; Gergely Nagy (address@hidden)
;; David Edmondson (address@hidden)
;; Kelvin White (address@hidden)
-;; Maintainer: Amin Bandali <address@hidden>
+;; Maintainer: Amin Bandali <address@hidden>
;; Keywords: IRC, chat, client, Internet
;; Version: 5.3
diff --git a/src/ftfont.c b/src/ftfont.c
index 2b442ea..6b549c3 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -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 }},