diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-12-05 00:13:56 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-12-05 00:13:56 +0000 |
| commit | 119191326014fa1aee3d75f83efaabcc819d576a (patch) | |
| tree | 433cbe5a2088db71e857ec2c2a5b7d471d222f50 /lisp/gnus/gnus-sync.el | |
| parent | b2b049bc3783e7de267b194489f0840220a7b78c (diff) | |
| download | emacs-119191326014fa1aee3d75f83efaabcc819d576a.tar.gz | |
gmm-utils.el (gmm-flet): Remove.
gnus-sync.el (gnus-sync-lesync-call)
message.el (message-read-from-minibuffer): Don't use it.
Diffstat (limited to 'lisp/gnus/gnus-sync.el')
| -rw-r--r-- | lisp/gnus/gnus-sync.el | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el index e2a71f0ee01..895a5e4d9a5 100644 --- a/lisp/gnus/gnus-sync.el +++ b/lisp/gnus/gnus-sync.el @@ -88,7 +88,6 @@ (require 'gnus) (require 'gnus-start) (require 'gnus-util) -(require 'gmm-utils) (defvar gnus-topic-alist) ;; gnus-group.el (eval-when-compile @@ -177,16 +176,21 @@ and `gnus-topic-alist'. Also see `gnus-variable-list'." (defun gnus-sync-lesync-call (url method headers &optional kvdata) "Make an access request to URL using KVDATA and METHOD. KVDATA must be an alist." - (gmm-flet ((json-alist-p (list) (gnus-sync-json-alist-p list))) ; temp patch - (let ((url-request-method method) - (url-request-extra-headers headers) - (url-request-data (if kvdata (json-encode kvdata) nil))) - (with-current-buffer (url-retrieve-synchronously url) - (let ((data (gnus-sync-lesync-parse))) - (gnus-message 12 "gnus-sync-lesync-call: %s URL %s sent %S got %S" - method url `((headers . ,headers) (data ,kvdata)) data) - (kill-buffer (current-buffer)) - data))))) + (let ((orig-json-alist-p (symbol-function 'json-alist-p))) + (fset 'json-alist-p + (lambda (list) (gnus-sync-json-alist-p list))) ; temp patch + (unwind-protect + (let ((url-request-method method) + (url-request-extra-headers headers) + (url-request-data (if kvdata (json-encode kvdata) nil))) + (with-current-buffer (url-retrieve-synchronously url) + (let ((data (gnus-sync-lesync-parse))) + (gnus-message + 12 "gnus-sync-lesync-call: %s URL %s sent %S got %S" + method url `((headers . ,headers) (data ,kvdata)) data) + (kill-buffer (current-buffer)) + data))) + (fset 'json-alist-p orig-json-alist-p)))) (defun gnus-sync-lesync-PUT (url headers &optional data) (gnus-sync-lesync-call url "PUT" headers data)) |