2000-10-08 10:59:13 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-ems.el (gnus-kill-all-overlays): Move here.
	* gnus-util.el (gnus-kill-all-overlays): Move out.
	* gnus-sum.el (gnus-cache-write-active): Auto load.
	* lpath.el: Shut up.
	* nnweb.el (nnweb-url-retrieve-asynch): url-retrieve is
	asynchronous in Exp version.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86a1027..c01464a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-08 10:59:13  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-ems.el (gnus-kill-all-overlays): Move here.
+       * gnus-util.el (gnus-kill-all-overlays): Move out.
+       * gnus-sum.el (gnus-cache-write-active): Auto load.
+       * lpath.el: Shut up.
+       * nnweb.el (nnweb-url-retrieve-asynch): url-retrieve is 
+       asynchronous in Exp version.
+
 2000-10-08 08:57:13  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-art.el, gnus-ems.el, gnus-start.el: Remove gnus-xemacs.

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 06bdfa2..ef9442e 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -50,6 +50,14 @@
   (autoload 'gnus-smiley-display "smiley-ems") ; override XEmacs version
 )
 
+(defun gnus-kill-all-overlays ()
+  "Delete all overlays in the current buffer."
+  (let* ((overlayss (overlay-lists))
+        (buffer-read-only nil)
+        (overlays (delq nil (nconc (car overlayss) (cdr overlayss)))))
+    (while overlays
+      (delete-overlay (pop overlays)))))
+
 ;;; Mule functions.
 
 (defun gnus-mule-max-width-function (el max-width)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 59e5a35..e014111 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -37,6 +37,7 @@
 (require 'gnus-util)
 (require 'mm-decode)
 (autoload 'gnus-summary-limit-include-cached "gnus-cache" nil t)
+(autoload 'gnus-cache-write-active "gnus-cache")
 
 (defcustom gnus-kill-summary-on-exit t
   "*If non-nil, kill the summary buffer when you exit from it.

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 72e4d03..df776a7 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -451,14 +451,6 @@ If N, return the Nth ancestor instead."
                     (file-name-nondirectory file))))
   (copy-file file to))
 
-(defun gnus-kill-all-overlays ()
-  "Delete all overlays in the current buffer."
-  (let* ((overlayss (overlay-lists))
-        (buffer-read-only nil)
-        (overlays (delq nil (nconc (car overlayss) (cdr overlayss)))))
-    (while overlays
-      (delete-overlay (pop overlays)))))
-
 (defvar gnus-work-buffer " *gnus work*")
 
 (defun gnus-set-work-buffer ()

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 175586f..0d1b7ec 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -11,96 +11,77 @@
 (defun maybe-bind (args)
   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
 
+(maybe-fbind '(babel-fetch
+              babel-wash create-image decode-coding-string display-graphic-p
+              find-image font-create-object gnus-mule-get-coding-system
+              image-size image-type-available-p insert-image
+              mail-aliases-setup mm-copy-tree
+              mule-write-region-no-coding-system put-image
+              rmail-select-summary rmail-summary-exists rmail-update-summary
+              sc-cite-regexp set-font-family set-font-size temp-directory
+              url-view-url vcard-pretty-print
+              w3-coding-system-for-mime-charset w3-prepare-buffer w3-region
+              widget-make-intangible x-defined-colors))
+
+(maybe-bind '(adaptive-fill-first-line-regexp
+             adaptive-fill-regexp babel-history babel-translations
+             display-time-mail-function imap-password mail-mode-hook
+             url-current-callback-func url-be-asynchronous 
+             url-current-callback-data url-working-buffer
+             url-current-mime-headers w3-meta-charset-content-type-regexp
+             w3-meta-content-type-charset-regexp))
+
 (if (featurep 'xemacs)
     (progn
       (defvar track-mouse nil)
-      (maybe-fbind '(posn-point
-                    event-start x-popup-menu
-                    facemenu-get-face window-at coordinates-in-window-p
-                    compute-motion x-defined-colors easy-menu-create-keymaps
-                    read-event internal-find-face internal-next-face-id
-                    make-face-internal set-frame-face-alist frame-face-alist
-                    facemenu-add-new-face make-face-x-resource-internal
-                    set-font-size set-font-family posn-window
-                    run-with-idle-timer mouse-minibuffer-check window-edges
-                    event-click-count track-mouse read-event mouse-movement-p
-                    event-end mouse-scroll-subr overlay-lists delete-overlay
-                    set-face-stipple mail-abbrevs-setup
-                    make-char-table set-char-table-range font-create-object
-                    x-color-values widget-make-intangible error-message-string
-                    w3-form-encode-xwfu gnus-mule-get-coding-system
-                    decode-coding-string mail-aliases-setup
-                    mm-copy-tree url-view-url w3-prepare-buffer
-                    set-buffer-multibyte
-                    find-non-ascii-charset-region char-charset
-                    mule-write-region-no-coding-system
-                    find-charset-region
-                    find-coding-systems-region get-charset-property
-                    coding-system-get w3-region
-                    w3-coding-system-for-mime-charset 
-                    rmail-summary-exists rmail-select-summary
-                    rmail-update-summary url-retrieve
-                    temp-directory babel-fetch babel-wash
-                    find-coding-systems-for-charsets sc-cite-regexp
-                    vcard-pretty-print image-type-available-p
-                    put-image create-image  display-graphic-p
-                    find-image insert-image image-size
-                    make-overlay overlay-put overlay-buffer overlay-start
-                    overlay-get overlay-end))
-      (maybe-bind '(global-face-data
-                   mark-active transient-mark-mode mouse-selection-click-count
-                   mouse-selection-click-count-buffer buffer-display-table
-                   font-lock-defaults user-full-name user-login-name
-                   gnus-newsgroup-name gnus-article-x-face-too-ugly
+      (maybe-fbind '(char-charset
+                    coding-system-get compute-motion coordinates-in-window-p
+                    delete-overlay easy-menu-create-keymaps
+                    error-message-string event-click-count event-end
+                    event-start facemenu-add-new-face facemenu-get-face
+                    find-charset-region find-coding-systems-for-charsets
+                    find-coding-systems-region find-non-ascii-charset-region
+                    frame-face-alist get-charset-property internal-find-face
+                    internal-next-face-id mail-abbrevs-setup make-char-table
+                    make-face-internal make-face-x-resource-internal
+                    make-overlay mouse-minibuffer-check mouse-movement-p
+                    mouse-scroll-subr overlay-buffer overlay-end
+                    overlay-get overlay-lists overlay-put
+                    overlay-start posn-point posn-window
+                    read-event read-event run-with-idle-timer
+                    set-buffer-multibyte set-char-table-range
+                    set-face-stipple set-frame-face-alist track-mouse
+                    url-retrieve w3-form-encode-xwfu window-at
+                    window-edges x-color-values x-popup-menu))
+      (maybe-bind '(buffer-display-table 
+                   buffer-file-coding-system font-lock-defaults
+                   global-face-data gnus-article-x-face-too-ugly
                    gnus-newsgroup-charset gnus-newsgroup-emphasis-alist
-                   mail-mode-hook
-                   adaptive-fill-first-line-regexp adaptive-fill-regexp
-                   url-current-mime-headers buffer-file-coding-system
-                   w3-image-mappings url-current-mime-type
-                   w3-meta-content-type-charset-regexp
-                   w3-meta-charset-content-type-regexp
-                   url-current-callback-func url-current-callback-data
-                   url-be-asynchronous temporary-file-directory
-                   babel-translations babel-history
-                   display-time-mail-function imap-password
-                   )))
-  (maybe-bind '(mail-mode-hook
-               enable-multibyte-characters browse-url-browser-function
-               adaptive-fill-first-line-regexp adaptive-fill-regexp
-               url-current-mime-headers help-echo-owns-message
-               w3-meta-content-type-charset-regexp
-               w3-meta-charset-content-type-regexp
-               babel-translations babel-history
-               display-time-mail-function imap-password))
-  (maybe-fbind '(color-instance-rgb-components
-                temp-directory
-                glyph-width annotation-glyph window-pixel-width glyph-height
-                window-pixel-height map-extents
-                make-color-instance color-instance-name specifier-instance
-                device-type device-class get-popup-menu-response event-object
-                x-defined-colors read-color add-submenu set-font-family
-                font-create-object set-font-size frame-device find-face
-                set-extent-property make-extent characterp display-error
-                set-face-doc-string frame-property face-doc-string
-                button-press-event-p next-command-event
-                widget-make-intangible glyphp make-glyph set-glyph-image
-                set-glyph-property event-glyph glyph-property event-point
-                device-on-window-system-p make-gui-button Info-goto-node
-                pp-to-string color-name
-                gnus-mule-get-coding-system decode-coding-string
-                mail-aliases-setup
-                mm-copy-tree url-view-url w3-prepare-buffer
-                mule-write-region-no-coding-system char-int
-                annotationp delete-annotation make-image-specifier
-                make-annotation events-to-keys
-                w3-do-setup w3-region
-                w3-coding-system-for-mime-charset 
-                rmail-summary-exists rmail-select-summary rmail-update-summary
-                url-generic-parse-url valid-image-instantiator-format-p
-                babel-fetch babel-wash babel-as-string sc-cite-regexp
-                put-image create-image display-graphic-p
-                find-image insert-image image-size
-                vcard-pretty-print image-type-available-p)))
+                   gnus-newsgroup-name mark-active
+                   mouse-selection-click-count
+                   mouse-selection-click-count-buffer
+                   temporary-file-directory transient-mark-mode
+                   url-current-mime-type
+                   user-full-name user-login-name
+                   w3-image-mappings)))
+  (maybe-bind '(browse-url-browser-function
+               enable-multibyte-characters help-echo-owns-message))
+  (maybe-fbind '(Info-goto-node
+                add-submenu annotation-glyph annotationp babel-as-string
+                button-press-event-p char-int characterp color-instance-name
+                color-instance-rgb-components color-name delete-annotation
+                device-class device-on-window-system-p device-type
+                display-error event-glyph event-object event-point
+                events-to-keys face-doc-string find-face frame-device
+                frame-property get-popup-menu-response glyph-height
+                glyph-property glyph-width glyphp make-annotation
+                make-color-instance make-extent make-glyph make-gui-button
+                make-image-specifier map-extents next-command-event
+                pp-to-string read-color set-extent-property
+                set-face-doc-string set-glyph-image set-glyph-property
+                specifier-instance url-generic-parse-url
+                valid-image-instantiator-format-p w3-do-setup
+                window-pixel-height window-pixel-width)))
 
 (require 'custom)
 

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 1f36d00..7d94959 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -336,20 +336,22 @@ and `altavista'.")
     (funcall callback t)
     (gnus-kill-buffer url-working-buffer)))
 
-(defun nnweb-url-retrieve-asynch (url callback &rest data)
-  (let ((url-request-method "GET")
-       (old-asynch url-be-asynchronous)
-       (url-request-data nil)
-       (url-request-extra-headers nil)
-       (url-working-buffer (generate-new-buffer-name " *nnweb*")))
-    (setq-default url-be-asynchronous t)
-    (save-excursion
-      (set-buffer (get-buffer-create url-working-buffer))
-      (setq url-current-callback-data data
-           url-be-asynchronous t
-           url-current-callback-func callback)
-      (url-retrieve url))
-    (setq-default url-be-asynchronous old-asynch)))
+(if (fboundp 'url-retrieve-synchronously)
+    (defalias 'nnweb-url-retrieve-asynch 'url-retrieve)
+  (defun nnweb-url-retrieve-asynch (url callback &rest data)
+    (let ((url-request-method "GET")
+         (old-asynch url-be-asynchronous)
+         (url-request-data nil)
+         (url-request-extra-headers nil)
+         (url-working-buffer (generate-new-buffer-name " *nnweb*")))
+      (setq-default url-be-asynchronous t)
+      (save-excursion
+       (set-buffer (get-buffer-create url-working-buffer))
+       (setq url-current-callback-data data
+             url-be-asynchronous t
+             url-current-callback-func callback)
+       (url-retrieve url nil))
+      (setq-default url-be-asynchronous old-asynch))))
 
 ;;;
 ;;; DejaNews functions.