Commit 4a43ee9b authored by Miles Bader's avatar Miles Bader
Browse files

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 77-78)

   - Update from CVS

2005-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (article-display-x-face): Replace
   process-kill-without-query by gnus-set-process-query-on-exit-flag.

   * lisp/gnus/gnus-group.el: Bind gnus-cache-active-hashtb when compiling.

   * lisp/gnus/gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
   set-process-query-on-exit-flag or process-kill-without-query.

   * lisp/gnus/html2text.el (html2text-fix-paragraphs): Use `while - re-search'
   loop instead of replace-regexp.

   * lisp/gnus/imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
   instead of process-kill-without-query if it is available.

   * lisp/gnus/mm-util.el (mm-insert-file-contents): Bind find-file-hook
   instead of find-file-hooks if it is available.

   * lisp/gnus/mml1991.el: Bind pgg-default-user-id when compiling.

   * lisp/gnus/mml2015.el: Bind pgg-default-user-id when compiling.

   * lisp/gnus/nndraft.el (nndraft-request-associate-buffer): Use
   write-contents-functions instead of write-contents-hooks if it is
   available.

   * lisp/gnus/nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
   instead of find-file-hooks if it is available.

   * lisp/gnus/nntp.el (nntp-open-connection): Replace
   process-kill-without-query by gnus-set-process-query-on-exit-flag.
   (nntp-open-ssl-stream): Ditto.
   (nntp-open-tls-stream): Ditto.

   * lisp/gnus/pgg.el: Don't bind itimer vars; don't autoload itimer functions.
   (pgg-run-at-time-1): New macro.
   (pgg-run-at-time): Use it.

   * lisp/gnus/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.

2005-05-31  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/imap.el (imap-ssl-open): Use imap-process-connection-type,
   instead of hard coding to nil.

2005-05-31  Kevin Greiner  <kgreiner@xpediantsolutions.com>

   * lisp/gnus/gnus-group.el (): Require gnus-sum and autoload functions to
   resolve warnings when gnus-group.el compiled alone.
parent 9ccee7d0
2005-05-31 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (article-display-x-face): Replace
process-kill-without-query by gnus-set-process-query-on-exit-flag.
* gnus-group.el: Bind gnus-cache-active-hashtb when compiling.
* gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
set-process-query-on-exit-flag or process-kill-without-query.
* html2text.el (html2text-fix-paragraphs): Use `while - re-search'
loop instead of replace-regexp.
* imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
instead of process-kill-without-query if it is available.
* mm-util.el (mm-insert-file-contents): Bind find-file-hook
instead of find-file-hooks if it is available.
* mml1991.el: Bind pgg-default-user-id when compiling.
* mml2015.el: Bind pgg-default-user-id when compiling.
* nndraft.el (nndraft-request-associate-buffer): Use
write-contents-functions instead of write-contents-hooks if it is
available.
* nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
instead of find-file-hooks if it is available.
* nntp.el (nntp-open-connection): Replace
process-kill-without-query by gnus-set-process-query-on-exit-flag.
(nntp-open-ssl-stream): Ditto.
(nntp-open-tls-stream): Ditto.
* pgg.el: Don't bind itimer vars; don't autoload itimer functions.
(pgg-run-at-time-1): New macro.
(pgg-run-at-time): Use it.
* 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.
2005-05-31 Simon Josefsson <jas@extundo.com>
* imap.el (imap-ssl-open): Use imap-process-connection-type,
instead of hard coding to nil.
2005-05-31 Kevin Greiner <kgreiner@xpediantsolutions.com>
* gnus-group.el (): Require gnus-sum and autoload functions to
resolve warnings when gnus-group.el compiled alone.
2005-05-30 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-agent.el (gnus-agent-regenerate-group)
......
......@@ -2181,10 +2181,11 @@ unfolded."
;; The command is a string, so we interpret the command
;; as a, well, command, and fork it off.
(let ((process-connection-type nil))
(process-kill-without-query
(gnus-set-process-query-on-exit-flag
(start-process
"article-x-face" nil shell-file-name
shell-command-switch gnus-article-x-face-command))
shell-command-switch gnus-article-x-face-command)
nil)
(with-temp-buffer
(insert face)
(process-send-region "article-x-face"
......
......@@ -41,7 +41,11 @@
(require 'time-date)
(require 'gnus-ems)
(eval-when-compile (require 'mm-url))
(eval-when-compile
(require 'mm-url)
(let ((features (cons 'gnus-group features)))
(require 'gnus-sum))
(defvar gnus-cache-active-hashtb))
(defcustom gnus-group-archive-directory
"/ftp@ftp.hpc.uh.edu:/pub/emacs/ding-list/"
......
......@@ -1571,6 +1571,11 @@ empty directories from OLD-PATH."
(file-truename
(concat old-dir "..")))))))))
(if (fboundp 'set-process-query-on-exit-flag)
(defalias 'gnus-set-process-query-on-exit-flag
'set-process-query-on-exit-flag)
(defalias 'gnus-set-process-query-on-exit-flag
'process-kill-without-query))
(provide 'gnus-util)
......
;;; html2text.el --- a simple html to plain text converter
;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Joakim Hove <hove@phys.ntnu.no>
......@@ -374,7 +374,8 @@ formatting, and then moved afterward.")
fashion, quite close to pure guess-work. It does work in some cases though."
(interactive)
(goto-char (point-min))
(replace-regexp "^<br>$" "")
(while (re-search-forward "^<br>$" nil t)
(delete-region (match-beginning 0) (match-end 0)))
;; Removing lonely <br> on a single line, if they are left intact we
;; dont have any paragraphs at all.
(goto-char (point-min))
......
......@@ -640,7 +640,11 @@ sure of changing the value of `foo'."
(let* ((port (or port imap-default-ssl-port))
(coding-system-for-read imap-coding-system-for-read)
(coding-system-for-write imap-coding-system-for-write)
(process-connection-type nil)
(process-connection-type imap-process-connection-type)
(set-process-query-on-exit-flag
(if (fboundp 'set-process-query-on-exit-flag)
'set-process-query-on-exit-flag
'process-kill-without-query))
process)
(when (progn
(setq process (start-process
......@@ -650,7 +654,7 @@ sure of changing the value of `foo'."
(format-spec-make
?s server
?p (number-to-string port)))))
(process-kill-without-query process)
(funcall set-process-query-on-exit-flag process nil)
process)
(with-current-buffer buffer
(goto-char (point-min))
......
......@@ -889,22 +889,28 @@ to advanced Emacs features, such as file-name-handlers, format decoding,
`find-file-hooks', etc.
If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'.
This function ensures that none of these modifications will take place."
(let ((format-alist nil)
(auto-mode-alist (if inhibit nil (mm-auto-mode-alist)))
(default-major-mode 'fundamental-mode)
(enable-local-variables nil)
(after-insert-file-functions nil)
(enable-local-eval nil)
(find-file-hooks nil)
(inhibit-file-name-operation (if inhibit
'insert-file-contents
inhibit-file-name-operation))
(inhibit-file-name-handlers
(if inhibit
(append mm-inhibit-file-name-handlers
inhibit-file-name-handlers)
inhibit-file-name-handlers)))
(insert-file-contents filename visit beg end replace)))
(let* ((format-alist nil)
(auto-mode-alist (if inhibit nil (mm-auto-mode-alist)))
(default-major-mode 'fundamental-mode)
(enable-local-variables nil)
(after-insert-file-functions nil)
(enable-local-eval nil)
(inhibit-file-name-operation (if inhibit
'insert-file-contents
inhibit-file-name-operation))
(inhibit-file-name-handlers
(if inhibit
(append mm-inhibit-file-name-handlers
inhibit-file-name-handlers)
inhibit-file-name-handlers))
(ffh (if (boundp 'find-file-hook)
'find-file-hook
'find-file-hooks))
(val (symbol-value ffh)))
(set ffh nil)
(unwind-protect
(insert-file-contents filename visit beg end replace)
(set ffh val))))
(defun mm-append-to-file (start end filename &optional codesys inhibit)
"Append the contents of the region to the end of file FILENAME.
......
;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
;; Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Sascha Ldecke <sascha@meta-x.de>,
;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
......@@ -219,8 +220,10 @@
;; pgg wrapper
(defvar pgg-output-buffer)
(defvar pgg-errors-buffer)
(eval-when-compile
(defvar pgg-default-user-id)
(defvar pgg-errors-buffer)
(defvar pgg-output-buffer))
(defun mml1991-pgg-sign (cont)
(let (headers cte)
......
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: PGP MIME MML
......@@ -632,6 +633,7 @@
;;; pgg wrapper
(eval-when-compile
(defvar pgg-default-user-id)
(defvar pgg-errors-buffer)
(defvar pgg-output-buffer))
......
;;; nndraft.el --- draft article access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
......@@ -174,8 +174,11 @@
(setq buffer-file-name (expand-file-name file)
buffer-auto-save-file-name (make-auto-save-file-name))
(clear-visited-file-modtime)
(make-local-variable 'write-contents-hooks)
(push 'nndraft-generate-headers write-contents-hooks)
(let ((hook (if (boundp 'write-contents-functions)
'write-contents-functions
'write-contents-hooks)))
(gnus-make-local-hook hook)
(add-hook hook 'nndraft-generate-headers nil t))
article))
(deffoo nndraft-request-group (group &optional server dont-check)
......
;;; nnheader.el --- header access macros for Gnus and its backends
;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996,
;; 1997, 1998, 2000, 2001, 2002, 2003, 2004
;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
......@@ -953,15 +953,21 @@ find-file-hooks, etc.
(defun nnheader-find-file-noselect (&rest args)
"Open a file with some variables bound.
See `find-file-noselect' for the arguments."
(let ((format-alist nil)
(auto-mode-alist (mm-auto-mode-alist))
(default-major-mode 'fundamental-mode)
(enable-local-variables nil)
(after-insert-file-functions nil)
(enable-local-eval nil)
(find-file-hooks nil)
(coding-system-for-read nnheader-file-coding-system))
(apply 'find-file-noselect args)))
(let* ((format-alist nil)
(auto-mode-alist (mm-auto-mode-alist))
(default-major-mode 'fundamental-mode)
(enable-local-variables nil)
(after-insert-file-functions nil)
(enable-local-eval nil)
(coding-system-for-read nnheader-file-coding-system)
(ffh (if (boundp 'find-file-hook)
'find-file-hook
'find-file-hooks))
(val (symbol-value ffh)))
(set ffh nil)
(unwind-protect
(apply 'find-file-noselect args)
(set ffh val))))
(defun nnheader-directory-regular-files (dir)
"Return a list of all regular files in DIR."
......
......@@ -1128,7 +1128,7 @@ password contained in '~/.nntp-authinfo'."
(nntp-kill-buffer pbuffer))
(when (and (buffer-name pbuffer)
process)
(process-kill-without-query process)
(gnus-set-process-query-on-exit-flag process nil)
(if (and (nntp-wait-for process "^2.*\n" buffer nil t)
(memq (process-status process) '(open run)))
(prog1
......@@ -1162,7 +1162,7 @@ password contained in '~/.nntp-authinfo'."
(format-spec-make
?s nntp-address
?p nntp-port-number)))))
(process-kill-without-query proc)
(gnus-set-process-query-on-exit-flag proc nil)
(save-excursion
(set-buffer buffer)
(let ((nntp-connection-alist (list proc buffer nil)))
......@@ -1173,7 +1173,7 @@ password contained in '~/.nntp-authinfo'."
(defun nntp-open-tls-stream (buffer)
(let ((proc (open-tls-stream "nntpd" buffer nntp-address nntp-port-number)))
(process-kill-without-query proc)
(gnus-set-process-query-on-exit-flag proc nil)
(save-excursion
(set-buffer buffer)
(let ((nntp-connection-alist (list proc buffer nil)))
......
;;; pgg.el --- glue for the various PGP implementations.
;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/10/28
......@@ -97,82 +97,76 @@
(read-passwd prompt)))
(eval-when-compile
(defvar itimer-process)
(defvar itimer-timer)
(autoload 'delete-itimer "itimer")
(autoload 'itimer-driver-start "itimer")
(autoload 'itimer-value "itimer")
(autoload 'set-itimer-function "itimer")
(autoload 'set-itimer-function-arguments "itimer")
(autoload 'set-itimer-restart "itimer")
(autoload 'start-itimer "itimer"))
(defmacro pgg-run-at-time-1 (time repeat function args)
(when (featurep 'xemacs)
(if (condition-case nil
(let ((delete-itimer 'delete-itimer)
(itimer-driver-start 'itimer-driver-start)
(itimer-value 'itimer-value)
(start-itimer 'start-itimer))
(unless (or (symbol-value 'itimer-process)
(symbol-value 'itimer-timer))
(funcall itimer-driver-start))
;; Check whether there is a bug to which the difference of
;; the present time and the time when the itimer driver was
;; woken up is subtracted from the initial itimer value.
(let* ((inhibit-quit t)
(ctime (current-time))
(itimer-timer-last-wakeup
(prog1
ctime
(setcar ctime (1- (car ctime)))))
(itimer-list nil)
(itimer (funcall start-itimer "pgg-run-at-time"
'ignore 5)))
(sleep-for 0.1) ;; Accept the timeout interrupt.
(prog1
(> (funcall itimer-value itimer) 0)
(funcall delete-itimer itimer))))
(error nil))
`(let ((time ,time))
(apply #'start-itimer "pgg-run-at-time"
,function (if time (max time 1e-9) 1e-9)
,repeat nil t ,args)))
`(let ((time ,time)
(itimers (list nil)))
(setcar
itimers
(apply #'start-itimer "pgg-run-at-time"
(lambda (itimers repeat function &rest args)
(let ((itimer (car itimers)))
(if repeat
(progn
(set-itimer-function
itimer
(lambda (itimer repeat function &rest args)
(set-itimer-restart itimer repeat)
(set-itimer-function itimer function)
(set-itimer-function-arguments itimer args)
(apply function args)))
(set-itimer-function-arguments
itimer
(append (list itimer repeat function) args)))
(set-itimer-function
itimer
(lambda (itimer function &rest args)
(delete-itimer itimer)
(apply function args)))
(set-itimer-function-arguments
itimer
(append (list itimer function) args)))))
1e-9 (if time (max time 1e-9) 1e-9)
nil t itimers ,repeat ,function ,args))))))
(eval-and-compile
(defalias
'pgg-run-at-time
(if (featurep 'xemacs)
(if (condition-case nil
(progn
(unless (or itimer-process itimer-timer)
(itimer-driver-start))
;; Check whether there is a bug to which the difference of
;; the present time and the time when the itimer driver was
;; woken up is subtracted from the initial itimer value.
(let* ((inhibit-quit t)
(ctime (current-time))
(itimer-timer-last-wakeup
(prog1
ctime
(setcar ctime (1- (car ctime)))))
(itimer-list nil)
(itimer (start-itimer "pgg-run-at-time" 'ignore 5)))
(sleep-for 0.1) ;; Accept the timeout interrupt.
(prog1
(> (itimer-value itimer) 0)
(delete-itimer itimer))))
(error nil))
(lambda (time repeat function &rest args)
"Emulating function run as `run-at-time'.
(if (featurep 'xemacs)
(defun pgg-run-at-time (time repeat function &rest args)
"Emulating function run as `run-at-time'.
TIME should be nil meaning now, or a number of seconds from now.
Return an itimer object which can be used in either `delete-itimer'
or `cancel-timer'."
(apply #'start-itimer "pgg-run-at-time"
function (if time (max time 1e-9) 1e-9)
repeat nil t args))
(lambda (time repeat function &rest args)
"Emulating function run as `run-at-time' in the right way.
TIME should be nil meaning now, or a number of seconds from now.
Return an itimer object which can be used in either `delete-itimer'
or `cancel-timer'."
(let ((itimers (list nil)))
(setcar
itimers
(apply #'start-itimer "pgg-run-at-time"
(lambda (itimers repeat function &rest args)
(let ((itimer (car itimers)))
(if repeat
(progn
(set-itimer-function
itimer
(lambda (itimer repeat function &rest args)
(set-itimer-restart itimer repeat)
(set-itimer-function itimer function)
(set-itimer-function-arguments itimer args)
(apply function args)))
(set-itimer-function-arguments
itimer
(append (list itimer repeat function) args)))
(set-itimer-function
itimer
(lambda (itimer function &rest args)
(delete-itimer itimer)
(apply function args)))
(set-itimer-function-arguments
itimer
(append (list itimer function) args)))))
1e-9 (if time (max time 1e-9) 1e-9)
nil t itimers repeat function args)))))
'run-at-time)))
(pgg-run-at-time-1 time repeat function args))
(defalias 'pgg-run-at-time 'run-at-time)))
(defun pgg-add-passphrase-cache (key passphrase)
(setq key (pgg-truncate-key-identifier key))
......
;;; starttls.el --- STARTTLS functions
;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Author: Simon Josefsson <simon@josefsson.org>
......@@ -235,6 +236,12 @@ handshake, or NIL on failure."
(starttls-negotiate-gnutls process)
(signal-process (process-id process) 'SIGALRM)))
(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
......@@ -246,7 +253,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
......@@ -286,7 +293,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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment