[Emacs-diffs] Changes to emacs/lisp/find-file.el [lexbind]

[Miles Bader]

Index: emacs/lisp/find-file.el
diff -c emacs/lisp/find-file.el:1.18.2.1 emacs/lisp/find-file.el:1.18.2.2
*** emacs/lisp/find-file.el:1.18.2.1    Fri Apr  4 01:20:05 2003
--- emacs/lisp/find-file.el     Tue Oct 14 19:51:03 2003
***************
*** 4,10 ****
  ;; Maintainer: FSF
  ;; Keywords: c, matching, tools
  
! ;; Copyright (C) 1994, 1995, 2002 Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  ;; Maintainer: FSF
  ;; Keywords: c, matching, tools
  
! ;; Copyright (C) 1994, 1995, 2002, 2003 Free Software Foundation, Inc.
  
  ;; This file is part of GNU Emacs.
  
***************
*** 182,201 ****
    :type 'boolean
    :group 'ff)
  
  (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'.
  Specifies how to recognise special constructs such as include files
--- 182,194 ----
    :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)))))
      )
    "*A list of regular expressions for `ff-find-file'.
  Specifies how to recognise special constructs such as include files
***************
*** 944,951 ****
  
  (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)
  ;;
  (defun ff-which-function-are-we-in ()
--- 937,942 ----
***************
*** 976,979 ****
--- 967,971 ----
  
  (provide 'find-file)
  
+ ;;; arch-tag: 5a2fc49e-3b0a-4708-9acf-fb14e471a97a
  ;;; find-file.el ends here