From 44e043215b6c7fcdcef8e0494d085423ca7d4bbd Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 31 May 2005 23:05:19 +0000 Subject: [PATCH] Synch to No Gnus 200505312304. --- lisp/ChangeLog | 8 ++++++++ lisp/gnus-util.el | 12 +++++------- lisp/lpath.el | 8 ++++---- lisp/starttls.el | 12 +++++------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5dadacb..b8e8968 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2005-05-31 Katsumi Yamaoka + + * lpath.el: Fbind ldap-search-entries. + + * gnus-util.el (gnus-set-process-query-on-exit-flag): Use defalias. + + * starttls.el (starttls-set-process-query-on-exit-flag): Ditto. + 2005-05-31 Simon Josefsson * smime.el (smime-replace-in-string): Define. diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 143f0e9..c5bd20a 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -1596,13 +1596,11 @@ empty directories from OLD-PATH." (ignore-errors (set-file-modes filename mode))) -(defun gnus-set-process-query-on-exit-flag (process flag) - "Run `set-process-query-on-exit-flag' if it is available. -Otherwise, run `process-kill-without-query'." - (let ((fn (if (fboundp 'set-process-query-on-exit-flag) - 'set-process-query-on-exit-flag - 'process-kill-without-query))) - (funcall fn process flag))) +(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) diff --git a/lisp/lpath.el b/lisp/lpath.el index d4ff257..1daee79 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -51,10 +51,10 @@ (maybe-fbind '(bbdb-complete-name delete-annotation delete-extent device-connection dfw-device events-to-keys font-lock-set-defaults frame-device - get-char-table glyph-height glyph-width mail-aliases-setup - make-annotation make-event make-glyph make-network-process - map-extents message-xmas-redefine put-char-table - set-extent-property temp-directory + get-char-table glyph-height glyph-width ldap-search-entries + mail-aliases-setup make-annotation make-event make-glyph + make-network-process map-extents message-xmas-redefine + put-char-table set-extent-property temp-directory valid-image-instantiator-format-p w3-coding-system-for-mime-charset w3-do-setup w3-prepare-buffer w3-region window-pixel-height diff --git a/lisp/starttls.el b/lisp/starttls.el index 5b1bd2b..4a7c69c 100644 --- a/lisp/starttls.el +++ b/lisp/starttls.el @@ -236,13 +236,11 @@ handshake, or NIL on failure." (starttls-negotiate-gnutls process) (signal-process (process-id process) 'SIGALRM))) -(defun starttls-set-process-query-on-exit-flag (process flag) - "Run `set-process-query-on-exit-flag' if it is available. -Otherwise, run `process-kill-without-query'." - (let ((fn (if (fboundp 'set-process-query-on-exit-flag) - 'set-process-query-on-exit-flag - 'process-kill-without-query))) - (funcall fn process flag))) +(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) -- 1.7.10.4