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

Various minor variable/hook cleanups.

Browse source 
* lisp/emacs-lisp/edebug.el (edebug-inhibit-emacs-lisp-mode-bindings):
Rename from gud-inhibit-global-bindings.

* lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-hooks): Doc fix.

* lisp/erc/erc-dcc.el (erc-dcc-chat-filter-functions): Rename from
erc-dcc-chat-filter-hook, since this is an abnormal hook.

* lisp/nxml/nxml-glyph.el (nxml-glyph-set-functions): Rename abnormal
hook from nxml-glyph-set-hook.

* lisp/progmodes/cwarn.el (cwarn-mode): Remove redundant variable
declaration.

* lisp/progmodes/pascal.el (pascal-toggle-completions): Doc fix.

* lisp/textmodes/bibtex.el (bibtex-string-file-path, bibtex-file-path):
Convert to defcustom.

* lisp/url/url-handlers.el (url-handler-regexp):
* lisp/url/url-nfs.el (url-nfs-automounter-directory-spec):
* lisp/url/url-vars.el (url-load-hook): Convert to defcustom.
This commit is contained in:
Chong Yidong 2012-06-12 13:47:14 +08:00
parent bf67e61f29
commit f1a4e679f3
14 changed files with 114 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/url/ChangeLog
View file

@ -1,3 +1,9 @@
2012-06-12 Chong Yidong <cyd@gnu.org>
* url-handlers.el (url-handler-regexp):
* url-nfs.el (url-nfs-automounter-directory-spec):
* url-vars.el (url-load-hook): Convert to defcustom.
2012-05-25 Leo Liu <sdl.web@gmail.com>
* url-http.el (url-http-codes): Fix mal-formed defconst.

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

@ -90,13 +90,24 @@
;; verify-visited-file-modtime
;; write-region
(defvar url-handler-regexp
"\\`\\(https?\\|ftp\\|file\\|nfs\\)://"
"A regular expression for matching URLs handled by `file-name-handler-alist'.
Some valid URL protocols just do not make sense to visit interactively
\(about, data, info, irc, mailto, etc\). This regular expression
avoids conflicts with local files that look like URLs \(Gnus is
particularly bad at this\).")
;;;###autoload
(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
added to `file-name-handler-alist'.
Some valid URL protocols just do not make sense to visit
interactively \(about, data, info, irc, mailto, etc\). This
regular expression avoids conflicts with local files that look
like URLs \(Gnus is particularly bad at this\)."
:group 'url
:type 'regexp
:set (lambda (symbol value)
(let ((enable url-handler-mode))
(url-handler-mode 0)
(set-default symbol value)
(if enable
(url-handler-mode)))))
;;;###autoload
(define-minor-mode url-handler-mode
@ -105,16 +116,13 @@ 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
(if (not (boundp 'file-name-handler-alist))
;; Can't be turned ON anyway.
(setq url-handler-mode nil)
;; 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))))
;; 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

7
lisp/url/url-nfs.el
View file

@ -27,8 +27,7 @@
(require 'url-parse)
(require 'url-file)
(defvar url-nfs-automounter-directory-spec
"file:/net/%h%f"
(defcustom url-nfs-automounter-directory-spec "file:/net/%h%f"
"How to invoke the NFS automounter. Certain % sequences are recognized.
%h -- the hostname of the NFS server
@ -38,7 +37,9 @@
%f -- the filename on the remote server
%% -- a literal %
Each can be used any number of times.")
Each can be used any number of times."
:group 'url
:type 'string)
(defun url-nfs-unescape (format host port user pass file)
(with-current-buffer (get-buffer-create " *nfs-parse*")

6
lisp/url/url-vars.el
View file

@ -375,8 +375,10 @@ Currently supported methods:
(modify-syntax-entry ?> ")<" url-parse-syntax-table)
(modify-syntax-entry ?/ " " url-parse-syntax-table)
(defvar url-load-hook nil
"Hooks to be run after initializing the URL library.")
(defcustom url-load-hook nil
"Hook run after initializing the URL library."
:group 'url
:type 'hook)
;;; Make OS/2 happy - yeeks
;; (defvar tcp-binary-process-input-services nil