From 7af1d7ff6f45709e9486e63523fbf62e9f690a3a Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Wed, 10 Mar 2010 22:54:51 -0800
Subject: * bugtracker: Debbugs's X-Emacs mail headers are now X-GNU headers.

---
 admin/notes/bugtracker | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'admin')

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 3870113489e..19a383dff5b 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -140,7 +140,7 @@ Remember to fix FOO, as discussed on emacs-devel at http://... .
 ** Not interested in tracker control messages (tags being set, etc)?
 Discard mails matching:
 
-^X-Emacs-PR-Message: (transcript|closed)
+^X-GNU-PR-Message: (transcript|closed)
 
 ** How to avoid multiple copies of mails.
 If you reply to reports in the normal way, this should work fine.
@@ -166,18 +166,18 @@ Sending a mail to 123-done does the following:
 2) Send a mail to the original submitter telling them that their bug
 has been closed.  This mail has a header:
 
-X-Emacs-PR-Message: they-closed 123
+X-GNU-PR-Message: they-closed 123
 
 3) Send a mail to you and to the emacs-bug-tracker list confirming
 that the bug has been closed.  This mail has a header:
 
-X-Emacs-PR-Message: closed 123
+X-GNU-PR-Message: closed 123
 
 4) Send a copy of your mail to the bug-gnu-emacs list in exactly the
 same way as if you had sent mail to "123" (sans -done). This mail has
 headers:
 
-X-Emacs-PR-Message: cc-closed 123
+X-GNU-PR-Message: cc-closed 123
 Mail-Followup-To: 123@debbugs.gnu.org, person-who-closed
 
 (This is Emacs-specific.  Normally the bug list gets the same mail as in 3).
-- 
cgit v1.2.1


From 9496bea877ecb07efa923a3f95c2106f19d25691 Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Sat, 13 Mar 2010 12:02:01 -0800
Subject: * copyright: Add note about lisp/cedet/semantic/imenu.el.

---
 admin/notes/copyright | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'admin')

diff --git a/admin/notes/copyright b/admin/notes/copyright
index f4ceb273c73..e0389212304 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -221,6 +221,11 @@ lib-src/etags.c
 lib-src/getopt1.c, getopt_int.h
   - these are from the GNU C library. Leave the copyrights alone.
 
+lisp/cedet/semantic/imenu.el
+  - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html
+   in which Eric Ludlam established that the remaining contributions
+   from authors other than himself were negligible.
+
 lisp/play/tetris.el
   - no special rules about the copyright. We note here that we believe
   (2007/1) there is no problem with our use of the name "tetris" or
-- 
cgit v1.2.1


From b70640642e488145f0277e4e80f38fecae741b9a Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu
Date: Sun, 21 Mar 2010 19:56:56 -0700
Subject: * keyboard.c (Fset_input_interrupt_mode): Remove code depending on
 NO_SOCK_SIGIO, not used anymore.

---
 admin/CPP-DEFINES | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'admin')

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 3c69e9e6a4a..7ab0c3f52a4 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -75,9 +75,6 @@ NO_REMAP
 VIRT_ADDR_VARIES
 WORDS_BIG_ENDIAN
 
-** Not used anymore by any port, can be cleaned up
-NO_SOCK_SIGIO
-
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.
 
-- 
cgit v1.2.1