From: Chong Yidong <cyd@gnu.org>
Date: Tue, 12 Jun 2012 10:00:53 +0000 (+0800)
Subject: * url-handlers.el: Re-order file to avoid recursive load.
X-Git-Tag: emacs-24.2.90~1199^2~474^2~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47fc1d6ba8179861744412a9322378654a9c30d8;p=emacs.git

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

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 32015db8405..2eaa8fe97c8 100644
--- 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 dc412c2d16d..2cae2fbe426 100644
--- 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)