From 78f3273aab4817ead42af0db41e703dc7e90260b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 4 May 2012 13:14:14 +0800 Subject: Convert more defvars to defcustoms. * dos-w32.el (file-name-buffer-file-type-alist) (direct-print-region-use-command-dot-com): * ffap.el (ffap-menu-regexp): * follow.el (follow-debug): * forms.el (forms--debug): * iswitchb.el (iswitchb-all-frames): * ido.el (ido-all-frames): * mail/feedmail.el (feedmail-mail-send-hook) (feedmail-mail-send-hook-queued): * mail/footnote.el (footnote-signature-separator): * mail/mailabbrev.el (mail-alias-separator-string) (mail-abbrev-mode-regexp): * mail/rmail.el (rmail-speedbar-match-folder-regexp): * progmodes/idlwave.el (idlwave-libinfo-file) (idlwave-default-completion-case-is-down) (idlwave-library-routines): Convert defvars to defcustoms. * mail/rmail.el (rmail-decode-mime-charset): * progmodes/idlw-shell.el (idlwave-shell-print-expression-function) (idlwave-shell-fix-inserted-breaks) (idlwave-shell-activate-alt-keybindings) (idlwave-shell-use-breakpoint-glyph): * facemenu.el (facemenu-unlisted-faces): Delete obsolete vars. * doc/lispref/os.texi (Timers): Use defopt for timer-max-repeats. --- lisp/find-file.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lisp/find-file.el') diff --git a/lisp/find-file.el b/lisp/find-file.el index fe1ab96add9..1deafc9734c 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -181,21 +181,21 @@ To override this, give an argument to `ff-find-other-file'." :group 'ff) ;;;###autoload -(defvar ff-special-constructs - `( - ;; C/C++ include, for NeXTstep too - (,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") . +(defcustom ff-special-constructs + ;; C/C++ include, for NeXTstep too + `((,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") . (lambda () - (buffer-substring (match-beginning 2) (match-end 2)))) - ) + (buffer-substring (match-beginning 2) (match-end 2))))) ;; We include `ff-treat-as-special' documentation here so that autoload ;; can make it available to be read prior to loading this file. - "List of special constructs for `ff-treat-as-special' to recognize. + "List of special constructs recognized by `ff-treat-as-special'. Each element, tried in order, has the form (REGEXP . EXTRACT). If REGEXP matches the current line (from the beginning of the line), `ff-treat-as-special' calls function EXTRACT with no args. If EXTRACT returns nil, keep trying. Otherwise, return the -filename that EXTRACT returned.") +filename that EXTRACT returned." + :type '(repeat (cons regexp function)) + :group 'ff) (defvaralias 'ff-related-file-alist 'ff-other-file-alist) (defcustom ff-other-file-alist 'cc-other-file-alist -- cgit v1.2.1