HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spelling fixes.
[bpt/emacs.git]
/
lisp
/
find-file.el
diff --git
a/lisp/find-file.el
b/lisp/find-file.el
index
d4e335d
..
4d1953b
100644
(file)
--- a/
lisp/find-file.el
+++ b/
lisp/find-file.el
@@
-4,8
+4,7
@@
;; Maintainer: FSF
;; Keywords: c, matching, tools
;; Maintainer: FSF
;; Keywords: c, matching, tools
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2013 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-182,21
+181,21
@@
To override this, give an argument to `ff-find-other-file'."
:group 'ff)
;;;###autoload
:group 'ff)
;;;###autoload
-(defvar ff-special-constructs
- '(
- ;; C/C++ include, for NeXTSTEP too
- ("^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" .
+(defcustom ff-special-constructs
+ ;; C/C++ include, for NeXTstep too
+ `((,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") .
(lambda ()
(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.
;; 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
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
(defvaralias 'ff-related-file-alist 'ff-other-file-alist)
(defcustom ff-other-file-alist 'cc-other-file-alist
@@
-495,7
+494,7
@@
If optional IN-OTHER-WINDOW is non-nil, find the file in another window."
(setq name
(expand-file-name
(setq name
(expand-file-name
- (read-
file
-name
+ (read-
directory
-name
(format "Find or create %s in: " default-name)
default-directory default-name nil)))
(format "Find or create %s in: " default-name)
default-directory default-name nil)))
@@
-968,5
+967,4
@@
That name was previously determined by `ff-which-function-are-we-in'."
(provide 'find-file)
(provide 'find-file)
-;; arch-tag: 5a2fc49e-3b0a-4708-9acf-fb14e471a97a
;;; find-file.el ends here
;;; find-file.el ends here