Another sync.
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v
retrieving revision 1.159
diff -u -p -r1.159 ChangeLog
--- ChangeLog 3 Apr 2005 12:04:01 -0000 1.159
+++ ChangeLog 23 Sep 2005 13:00:13 -0000
@@ -1,3 +1,31 @@
+2005-09-23 Simon Josefsson <jas(a)extundo.com>
+
+ * reporter.el: Change maintainer to FSF, since nobody from the
+ XEmacs camp has touched this file for ages and it has effectively
+ been maintained by the FSF for quite some time through syncing
+ anyway.
+
+2005-08-08 Richard M. Stallman <rms(a)gnu.org>
+
+ * mail/reporter.el (reporter-dump-state): Use insert-buffer-substring.
+
+2005-06-02 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * starttls.el (starttls-set-process-query-on-exit-flag):
+ Use eval-and-compile.
+
+2005-05-31 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * starttls.el (starttls-set-process-query-on-exit-flag): Alias to
+ set-process-query-on-exit-flag or process-kill-without-query.
+ (starttls-open-stream-gnutls): Use it instead of
+ process-kill-without-query.
+ (starttls-open-stream): Ditto.
+
+2001-11-22 Colin Walters <walters(a)debian.org>
+
+ * mail/reporter.el (reporter-submit-bug-report): Doc fixes.
+
2005-04-03 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.73 released.
Index: mailheader.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/mailheader.el,v
retrieving revision 1.2
diff -u -p -r1.2 mailheader.el
--- mailheader.el 31 Dec 2000 00:02:38 -0000 1.2
+++ mailheader.el 23 Sep 2005 13:00:13 -0000
@@ -1,6 +1,6 @@
-;;; mailheader.el --- Mail header parsing, merging, formatting
+;;; mailheader.el --- mail header parsing, merging, formatting
-;; Copyright (C) 1996 by Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc.
;; Author: Erik Naggum <erik(a)naggum.no>
;; Keywords: tools, mail, news
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
@@ -191,4 +191,5 @@ A key of nil has as its value a list of
(provide 'mailheader)
+;;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0
;;; mailheader.el ends here
Index: reporter.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/reporter.el,v
retrieving revision 1.5
diff -u -p -r1.5 reporter.el
--- reporter.el 13 Oct 2001 14:17:40 -0000 1.5
+++ reporter.el 23 Sep 2005 13:00:13 -0000
@@ -1,9 +1,10 @@
;;; reporter.el --- customizable bug reporting of lisp programs
-;; Copyright (C) 1993,1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: 1993-1998 Barry A. Warsaw
-;; Maintainer: XEmacs Development Team
+;; Maintainer: FSF
;; Created: 19-Apr-1993
;; Keywords: maint mail tools
@@ -21,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
@@ -62,15 +63,6 @@
;; ;; ...
;; 'mypkg-variable-last)))
-;; Reporter Users
-;; ==============
-;; Packages that currently use reporter are: CC Mode, supercite, elp,
-;; tcl, ediff, crypt++ (crypt), dired-x, rmailgen, mode-line, vm,
-;; mh-e, edebug, archie, viper, w3-mode, framepop, hl319, hilit19,
-;; pgp, eos, hm--html, efs, webster19.
-;;
-;; If you know of others, please email me!
-
;;; Code:
@@ -272,7 +264,7 @@ dumped."
varlist)
(lisp-indent-line)
(insert ")\n"))
- (insert-buffer elbuf))
+ (insert-buffer-substring elbuf))
(error
(insert "State could not be dumped due to the following error:\n\n"
(format "%s" fault)
@@ -326,7 +318,7 @@ This function prompts for a summary if `
is non-nil.
This function does not send a message; it uses the given information
-to initialize a a messagem, which the user can then edit and finally send
+to initialize a message, which the user can then edit and finally send
\(or decline to send). The variable `mail-user-agent' controls which
mail-sending package is used for editing and sending the message."
(let ((reporter-eval-buffer (current-buffer))
@@ -416,4 +408,6 @@ mail-sending package is used for editing
(provide 'reporter)
+
+;;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
;;; reporter.el ends here
Index: rfc2104.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/rfc2104.el,v
retrieving revision 1.4
diff -u -p -r1.4 rfc2104.el
--- rfc2104.el 16 Sep 2004 13:01:29 -0000 1.4
+++ rfc2104.el 23 Sep 2005 13:00:13 -0000
@@ -1,5 +1,7 @@
;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas(a)pdc.kth.se>
;; Keywords: mail
@@ -18,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
Index: starttls.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/starttls.el,v
retrieving revision 1.3
diff -u -p -r1.3 starttls.el
--- starttls.el 10 Jun 2004 20:28:01 -0000 1.3
+++ starttls.el 23 Sep 2005 13:00:13 -0000
@@ -1,6 +1,7 @@
;;; starttls.el --- STARTTLS functions
-;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno(a)unixuser.org>
;; Author: Simon Josefsson <simon(a)josefsson.org>
@@ -21,8 +22,8 @@
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
@@ -228,6 +229,13 @@ handshake, or NIL on failure."
(starttls-negotiate-gnutls process)
(signal-process (process-id process) 'SIGALRM)))
+(eval-and-compile
+ (if (fboundp 'set-process-query-on-exit-flag)
+ (defalias 'starttls-set-process-query-on-exit-flag
+ 'set-process-query-on-exit-flag)
+ (defalias 'starttls-set-process-query-on-exit-flag
+ 'process-kill-without-query)))
+
(defun starttls-open-stream-gnutls (name buffer host service)
(message "Opening STARTTLS connection to `%s'..." host)
(let* (done
@@ -239,7 +247,7 @@ handshake, or NIL on failure."
(int-to-string service)
service)
starttls-extra-arguments)))
- (process-kill-without-query process)
+ (starttls-set-process-query-on-exit-flag process nil)
(while (and (processp process)
(eq (process-status process) 'run)
(save-excursion
@@ -279,7 +287,7 @@ specifying a port number to connect to."
name buffer starttls-program
host (format "%s" service)
starttls-extra-args)))
- (process-kill-without-query process)
+ (starttls-set-process-query-on-exit-flag process nil)
process)))
(provide 'starttls)