* url-handlers.el: Re-order file to avoid recursive load.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 32015db8405ab8df906cfcad2c8651303fee47df..2eaa8fe97c80a2d93ba246dc8e482fcf2ecff37b 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-12  Chong Yidong  <cyd@gnu.org>
+
+       * url-handlers.el: Re-order file to avoid recursive load.
+
 2012-06-12  Chong Yidong  <cyd@gnu.org>
 
        * url-handlers.el (url-handler-regexp):

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index dc412c2d16d257edf9f75f1fcf0774952b5b05b0..2cae2fbe42660f371e838684c66704d5d7a83dbd 100644 (file)
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -91,6 +91,20 @@
 ;; write-region
 
 ;;;###autoload
+(define-minor-mode url-handler-mode
+  "Toggle using `url' library for URL filenames (URL Handler mode).
+With a prefix argument ARG, enable URL Handler mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil."
+  :global t :group 'url
+  ;; Remove old entry, if any.
+  (setq file-name-handler-alist
+       (delq (rassq 'url-file-handler file-name-handler-alist)
+             file-name-handler-alist))
+  (if url-handler-mode
+      (push (cons url-handler-regexp 'url-file-handler)
+           file-name-handler-alist)))
+
 (defcustom url-handler-regexp "\\`\\(https?\\|ftp\\|file\\|nfs\\)://"
   "Regular expression for URLs handled by `url-handler-mode'.
 When URL Handler mode is enabled, this regular expression is
@@ -109,21 +123,6 @@ like URLs \(Gnus is particularly bad at this\)."
           (if enable
               (url-handler-mode)))))
 
-;;;###autoload
-(define-minor-mode url-handler-mode
-  "Toggle using `url' library for URL filenames (URL Handler mode).
-With a prefix argument ARG, enable URL Handler mode if ARG is
-positive, and disable it otherwise.  If called from Lisp, enable
-the mode if ARG is omitted or nil."
-  :global t :group 'url
-  ;; Remove old entry, if any.
-  (setq file-name-handler-alist
-       (delq (rassq 'url-file-handler file-name-handler-alist)
-             file-name-handler-alist))
-  (if url-handler-mode
-      (push (cons url-handler-regexp 'url-file-handler)
-           file-name-handler-alist)))
-
 (defun url-run-real-handler (operation args)
   (let ((inhibit-file-name-handlers (cons 'url-file-handler
                                          (if (eq operation inhibit-file-name-operation)