X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmm-url.el;h=7505f9f17ba301fb87b63cbc1df50473048f2d1a;hb=27688c4fe73986a46e3f2cb9051170f41ef82f4c;hp=c5b5256958030c4aed374dcd543d567dfde6bbed;hpb=088ebc790c1659ffa9cd25399fe1e3d6ed24c663;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index c5b5256..7505f9f 100644
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -17,8 +17,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -31,14 +31,16 @@
 
 (eval-when-compile (require 'cl))
 
-(require 'mm-util)
+(require 'nnheader) ;; for `mm-char-or-char-int-p'.
 (require 'gnus)
 
 (eval-and-compile
   (autoload 'exec-installed-p "path-util"))
 
 (eval-when-compile
-  (require 'timer))
+  (if (featurep 'xemacs)
+      (require 'timer-funcs)
+    (require 'timer)))
 
 (defgroup mm-url nil
   "A wrapper of url package and external url command for Gnus."
@@ -49,7 +51,7 @@
 				    (require 'url)
 				  (error nil)))
   "*If non-nil, use external grab program `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mm-url)
 
@@ -68,7 +70,7 @@
    (t "GET"))
   "The url grab program.
 Likely values are `wget', `w3m', `lynx' and `curl'."
-  :version "21.4"
+  :version "22.1"
   :type '(choice
 	  (symbol :tag "wget" wget)
 	  (symbol :tag "w3m" w3m)
@@ -79,7 +81,7 @@ Likely values are `wget', `w3m', `lynx' and `curl'."
 
 (defcustom mm-url-arguments nil
   "The arguments for `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'mm-url)