(rmail-current-message, rmail-inbox-list): Add defvars.

[gnu-emacs] / lisp / find-file.el

diff --git a/lisp/find-file.el b/lisp/find-file.el
index 259a85fa62ae008ef5f9a0437bfc936e118d7029..db03adce29fc4716ff51bf02bb91598a565277fa 100644 (file)
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -4,7 +4,8 @@
 ;; Maintainer: FSF
 ;; Keywords: c, matching, tools
 
 ;; Maintainer: FSF
 ;; Keywords: c, matching, tools
 

-;; Copyright (C) 1994, 1995, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.

 
 ;; This file is part of GNU Emacs.
 
 
 ;; This file is part of GNU Emacs.
 


@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -57,7 +58,7 @@
 ;; format above can be changed to include a function to be called when the
 ;; current file matches the regexp:
 ;;
 ;; format above can be changed to include a function to be called when the
 ;; current file matches the regexp:
 ;;

-;;   '(("\\.cc$"  cc-function)
+;;   '(("\\.cc$"  cc--function)

 ;;     ("\\.hh$"  hh-function))
 ;;
 ;; These functions must return a list consisting of the possible names of the
 ;;     ("\\.hh$"  hh-function))
 ;;
 ;; These functions must return a list consisting of the possible names of the


@@ -182,23 +183,16 @@ To override this, give an argument to `ff-find-other-file'."
   :type 'boolean
   :group 'ff)
 
   :type 'boolean
   :group 'ff)
 

+;;;###autoload

 (defvar ff-special-constructs
   '(
     ;; C/C++ include, for NeXTSTEP too
     ("^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" .
      (lambda ()
        (setq fname (buffer-substring (match-beginning 2) (match-end 2)))))
 (defvar ff-special-constructs
   '(
     ;; C/C++ include, for NeXTSTEP too
     ("^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" .
      (lambda ()
        (setq fname (buffer-substring (match-beginning 2) (match-end 2)))))

-
-    ;; Ada import
-    ("^with[ \t]+\\([a-zA-Z0-9_\\.]+\\)" .
-     (lambda ()
-       (setq fname (buffer-substring (match-beginning 1) (match-end 1)))
-       (require 'ada-mode)
-       (setq fname (concat (ada-make-filename-from-adaname fname)
-                          ada-spec-suffix))))

     )
   "*A list of regular expressions for `ff-find-file'.
     )
   "*A list of regular expressions for `ff-find-file'.

-Specifies how to recognise special constructs such as include files
+Specifies how to recognize special constructs such as include files

 etc. and an associated method for extracting the filename from that
 construct.")
 
 etc. and an associated method for extracting the filename from that
 construct.")
 


@@ -222,7 +216,7 @@ Set by default to `cc-search-directories', expanded at run-time.
 
 This list is searched through with each extension specified in
 `ff-other-file-alist' that matches this file's extension.  So the
 
 This list is searched through with each extension specified in
 `ff-other-file-alist' that matches this file's extension.  So the

-longer the list, the longer it'll take to realise that a file
+longer the list, the longer it'll take to realize that a file

 may not exist.
 
 A typical format is
 may not exist.
 
 A typical format is


@@ -246,22 +240,26 @@ the preceding slash.  The star represents all the subdirectories except
   :group 'ff)
 
 (defcustom cc-other-file-alist
   :group 'ff)
 
 (defcustom cc-other-file-alist

-  '(
-    ("\\.cc$"  (".hh" ".h"))
-    ("\\.hh$"  (".cc" ".C"))
+  '(("\\.cc\\'"  (".hh" ".h"))
+    ("\\.hh\\'"  (".cc" ".C"))

 
 

-    ("\\.c$"   (".h"))
-    ("\\.h$"   (".c" ".cc" ".C" ".CC" ".cxx" ".cpp"))
+    ("\\.c\\'"   (".h"))
+    ("\\.h\\'"   (".c" ".cc" ".C" ".CC" ".cxx" ".cpp"))

 
 

-    ("\\.C$"   (".H"  ".hh" ".h"))
-    ("\\.H$"   (".C"  ".CC"))
+    ("\\.C\\'"   (".H"  ".hh" ".h"))
+    ("\\.H\\'"   (".C"  ".CC"))

 
 

-    ("\\.CC$"  (".HH" ".H"  ".hh" ".h"))
-    ("\\.HH$"  (".CC"))
+    ("\\.CC\\'"  (".HH" ".H"  ".hh" ".h"))
+    ("\\.HH\\'"  (".CC"))

 
 

-    ("\\.cxx$" (".hh" ".h"))
-    ("\\.cpp$" (".hh" ".h"))
-    )
+    ("\\.c\\+\\+\\'" (".h++" ".hh" ".h"))
+    ("\\.h\\+\\+\\'" (".c++"))
+
+    ("\\.cpp\\'" (".hpp" ".hh" ".h"))
+    ("\\.hpp\\'" (".cpp"))
+
+    ("\\.cxx\\'" (".hxx" ".hh" ".h"))
+    ("\\.hxx\\'" (".cxx")))

   "*Alist of extensions to find given the current file's extension.
 
 This list should contain the most used extensions before the others,
   "*Alist of extensions to find given the current file's extension.
 
 This list should contain the most used extensions before the others,


@@ -343,7 +341,7 @@ Variables of interest include:
    If non-nil, traces which directories are being searched.
 
  - `ff-special-constructs'
    If non-nil, traces which directories are being searched.
 
  - `ff-special-constructs'

-   A list of regular expressions specifying how to recognise special
+   A list of regular expressions specifying how to recognize special

    constructs such as include files etc, and an associated method for
    extracting the filename from that construct.
 
    constructs such as include files etc, and an associated method for
    extracting the filename from that construct.
 


@@ -944,25 +942,19 @@ and the name of the file passed in."
 
 (defvar ff-function-name nil "Name of the function we are in.")
 
 
 (defvar ff-function-name nil "Name of the function we are in.")
 

-;(eval-when-compile (require 'ada-mode))
-

 ;; bind with (setq ff-pre-load-hook 'ff-which-function-are-we-in)
 ;;
 ;; bind with (setq ff-pre-load-hook 'ff-which-function-are-we-in)
 ;;

+(defvar ada-procedure-start-regexp)
+(defvar ada-package-start-regexp)
+

 (defun ff-which-function-are-we-in ()
   "Return the name of the function whose definition/declaration point is in.
 Also remember that name in `ff-function-name'."
 (defun ff-which-function-are-we-in ()
   "Return the name of the function whose definition/declaration point is in.
 Also remember that name in `ff-function-name'."

-
-  (setq ff-function-name nil)
-
-  (save-excursion
-    (if (re-search-backward ada-procedure-start-regexp nil t)
-        (setq ff-function-name (buffer-substring (match-beginning 0)
-                                                 (match-end 0)))
-      ; we didn't find a procedure start, perhaps there is a package
-      (if (re-search-backward ada-package-start-regexp nil t)
-          (setq ff-function-name (buffer-substring (match-beginning 0)
-                                                   (match-end 0)))
-        ))))
+  (setq ff-function-name
+        (save-excursion
+          (if (or (re-search-backward ada-procedure-start-regexp nil t)
+                  (re-search-backward ada-package-start-regexp nil t))
+              (match-string 0)))))

 
 ;; bind with (setq ff-post-load-hook 'ff-set-point-accordingly)
 ;;
 
 ;; bind with (setq ff-post-load-hook 'ff-set-point-accordingly)
 ;;


@@ -976,4 +968,5 @@ 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