mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Chong Yidong 2012-06-12 18:00:53 +08:00
parent f1a4e679f3
commit 47fc1d6ba8
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lisp/url/url-handlers.el
View file

@ -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)