X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/06d8ace51597cd41e110560a56a1abeb6cce23d6..affa9d2b30dab558bcba32a204500a848ed2e052:/lisp/find-file.el diff --git a/lisp/find-file.el b/lisp/find-file.el index 1cadbb9112..e428552318 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -4,8 +4,7 @@ ;; Maintainer: FSF ;; Keywords: c, matching, tools -;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1994-1995, 2001-2011 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -184,7 +183,7 @@ To override this, give an argument to `ff-find-other-file'." ;;;###autoload (defvar ff-special-constructs `( - ;; C/C++ include, for NeXTSTEP too + ;; C/C++ include, for NeXTstep too (,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") . (lambda () (buffer-substring (match-beginning 2) (match-end 2)))) @@ -495,7 +494,7 @@ If optional IN-OTHER-WINDOW is non-nil, find the file in another window." (setq name (expand-file-name - (read-file-name + (read-directory-name (format "Find or create %s in: " default-name) default-directory default-name nil)))