[Emacs-diffs] /srv/bzr/emacs/trunk r108572: * url-handlers.el: Re-order file to avoid recursive load.

[Chong Yidong]

------------------------------------------------------------
revno: 108572
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-12 18:00:53 +0800
message:
  * url-handlers.el: Re-order file to avoid recursive load.
modified:
  lisp/url/ChangeLog
  lisp/url/url-handlers.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-06-12 05:47:14 +0000
+++ b/lisp/url/ChangeLog        2012-06-12 10:00:53 +0000
@@ -1,5 +1,9 @@
 2012-06-12  Chong Yidong  <address@hidden>
 
+       * url-handlers.el: Re-order file to avoid recursive load.
+
+2012-06-12  Chong Yidong  <address@hidden>
+
        * url-handlers.el (url-handler-regexp):
        * url-nfs.el (url-nfs-automounter-directory-spec):
        * url-vars.el (url-load-hook): Convert to defcustom.

=== modified file 'lisp/url/url-handlers.el'
--- a/lisp/url/url-handlers.el  2012-06-12 05:47:14 +0000
+++ b/lisp/url/url-handlers.el  2012-06-12 10:00:53 +0000
@@ -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 @@
           (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)