* lpath.el: Fbind clear-string and cp-supported-codepages; don't fbind

replace-regexp-in-string; bind url-version; fbind display-images-p and
timer-set-function for XEmacs; bind timer-list for XEmacs; fbind
find-face and set-itimer-function for Emacs; bind itimer-list for
Emacs.

* mm-decode.el (mm-display-external): Use itimer function for XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a463943..96a5051 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lpath.el: Fbind clear-string and cp-supported-codepages; don't fbind
+       replace-regexp-in-string; bind url-version; fbind display-images-p and
+       timer-set-function for XEmacs; bind timer-list for XEmacs; fbind
+       find-face and set-itimer-function for Emacs; bind itimer-list for
+       Emacs.
+
+       * mm-decode.el (mm-display-external): Use itimer function for XEmacs.
+
 2007-01-01  Romain Francoise  <romain@orebokech.com>
 
        * gnus-sum.el (gnus-summary-make-menu-bar): Fix typo.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 370af86..694d2c7 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -10,12 +10,12 @@
   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
 
 (maybe-fbind '(Info-directory
-              Info-menu create-image custom-autoload display-graphic-p
-              display-time-event-handler epg-check-configuration
-              find-coding-system find-image image-size image-type-available-p
-              insert-image line-number-at-pos make-mode-line-mouse-map
-              make-network-process make-temp-file propertize put-image
-              replace-regexp-in-string rmail-msg-is-pruned
+              Info-menu clear-string cp-supported-codepages create-image
+              custom-autoload display-graphic-p display-time-event-handler
+              epg-check-configuration find-coding-system find-image image-size
+              image-type-available-p insert-image line-number-at-pos
+              make-mode-line-mouse-map make-network-process make-temp-file
+              propertize put-image rmail-msg-is-pruned
               rmail-msg-restore-non-pruned-header sort-coding-systems
               tool-bar-add-item tool-bar-add-item-from-menu
               tool-bar-local-item-from-menu unicode-precedence-list
@@ -24,21 +24,21 @@
               w3m-detect-meta-charset w3m-region x-focus-frame))
 (maybe-bind '(eudc-protocol
              filladapt-mode rmail-insert-mime-forwarded-message-function
-             w3-meta-charset-content-type-regexp
+             url-version w3-meta-charset-content-type-regexp
              w3-meta-content-type-charset-regexp))
 
 (if (featurep 'xemacs)
     (progn
       (maybe-fbind '(codepage-setup
-                    delete-overlay detect-coding-string eudc-expand-inline
-                    event-click-count event-end event-start
+                    delete-overlay detect-coding-string display-images-p
+                    eudc-expand-inline event-click-count event-end event-start
                     find-coding-systems-for-charsets
                     find-coding-systems-region find-coding-systems-string
                     mail-abbrevs-setup mouse-minibuffer-check mouse-movement-p
                     mouse-scroll-subr overlay-lists posn-point posn-window
                     read-event set-buffer-multibyte
                     select-frame-set-input-focus select-safe-coding-system
-                    track-mouse window-edges))
+                    timer-set-function track-mouse window-edges))
       (maybe-bind '(adaptive-fill-first-line-regexp
                    buffer-display-table buffer-file-coding-system
                    current-language-environment cursor-in-non-selected-windows
@@ -46,21 +46,21 @@
                    enable-multibyte-characters gnus-agent-expire-current-dirs
                    language-info-alist mark-active mouse-selection-click-count
                    mouse-selection-click-count-buffer pgg-parse-crc24
-                   temporary-file-directory transient-mark-mode)))
+                   temporary-file-directory timer-list transient-mark-mode)))
   (maybe-fbind '(bbdb-complete-name
                 delete-annotation delete-extent device-connection dfw-device
-                events-to-keys font-lock-set-defaults frame-device
+                events-to-keys find-face font-lock-set-defaults frame-device
                 get-char-table glyph-height glyph-width ldap-search-entries
                 mail-aliases-setup make-annotation make-event make-glyph
-                map-extents message-xmas-redefine
-                put-char-table set-extent-property temp-directory
+                map-extents message-xmas-redefine put-char-table
+                set-extent-property set-itimer-function temp-directory
                 valid-image-instantiator-format-p
                 w3-coding-system-for-mime-charset w3-do-setup
                 w3-prepare-buffer w3-region window-pixel-height
                 window-pixel-width))
-  (maybe-bind '(help-echo-owns-message mail-mode-hook mm-w3m-mode-map
-                                      show-nonbreak-escape
-                                      nobreak-char-display)))
+  (maybe-bind '(help-echo-owns-message
+               itimer-list mail-mode-hook mm-w3m-mode-map nobreak-char-display
+               show-nonbreak-escape)))
 
 (when (and (featurep 'xemacs)
           (not (featurep 'mule)))

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index ce3010f..e9ca1d4 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -881,13 +881,21 @@ external if displayed external."
                          ;; a vector in Emacs but is a list in XEmacs)
                          ;; requires that it is lexically scoped.
                          (timer (run-at-time 2.0 nil 'ignore)))
-                      (lambda (process state)
-                        (when (eq 'exit (process-status process))
-                          (if (memq timer timer-list)
-                              (timer-set-function timer fn)
-                            (funcall fn))
-                          (ignore-errors (eval fm))
-                          (message "%s" done))))))
+                      (if (boundp 'itimer-list)
+                          (lambda (process state)
+                            (when (eq 'exit (process-status process))
+                              (if (memq timer itimer-list)
+                                  (set-itimer-function timer fn)
+                                (funcall fn))
+                              (ignore-errors (eval fm))
+                              (message "%s" done)))
+                        (lambda (process state)
+                          (when (eq 'exit (process-status process))
+                            (if (memq timer timer-list)
+                                (timer-set-function timer fn)
+                              (funcall fn))
+                            (ignore-errors (eval fm))
+                            (message "%s" done)))))))
                (mm-handle-set-external-undisplayer
                 handle (cons file buffer)))
              (message "Displaying %s..." command))