[Emacs-diffs] Changes to emacs/lisp/files.el

[Luc Teirlinck]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.768 emacs/lisp/files.el:1.769
*** emacs/lisp/files.el:1.768   Fri May 13 07:56:28 2005
--- emacs/lisp/files.el Sat May 14 00:56:30 2005
***************
*** 541,547 ****
  the value of `default-directory'."
    (unless dir
      (setq dir default-directory))
!   (read-file-name prompt dir (or default-dirname 
                                 (if initial (expand-file-name initial dir)
                                   dir))
                  mustmatch initial
--- 541,547 ----
  the value of `default-directory'."
    (unless dir
      (setq dir default-directory))
!   (read-file-name prompt dir (or default-dirname
                                 (if initial (expand-file-name initial dir)
                                   dir))
                  mustmatch initial
***************
*** 1944,1950 ****
    "Alist mapping interpreter names to major modes.
  This is used for files whose first lines match `auto-mode-interpreter-regexp'.
  Each element looks like (INTERPRETER . MODE).
! The car of each element is compared with
  the name of the interpreter specified in the first line.
  If it matches, mode MODE is selected.
  
--- 1944,1950 ----
    "Alist mapping interpreter names to major modes.
  This is used for files whose first lines match `auto-mode-interpreter-regexp'.
  Each element looks like (INTERPRETER . MODE).
! The car of each element, a regular expression, is compared with
  the name of the interpreter specified in the first line.
  If it matches, mode MODE is selected.
  
***************
*** 1961,1973 ****
  (defvar auto-mode-interpreter-regexp
    "#![ \t]?\\([^ \t\n]*\
  /bin/env[ \t]\\)?\\([^ \t\n]+\\)"
!   "Regular expression matching interpreters, for file mode determination.
  This regular expression is matched against the first line of a file
! to determine the file's mode in `set-auto-mode' when Emacs can't deduce
! a mode from the file's name.  If it matches, the file is assumed to
! be interpreted by the interpreter matched by the second group of the
! regular expression.  The mode is then determined as the mode associated
! with that interpreter in `interpreter-mode-alist'.")
  
  (defvar magic-mode-alist
    `(;; The < comes before the groups (but the first) to reduce backtracking.
--- 1961,1972 ----
  (defvar auto-mode-interpreter-regexp
    "#![ \t]?\\([^ \t\n]*\
  /bin/env[ \t]\\)?\\([^ \t\n]+\\)"
!   "Regexp matching interpreters, for file mode determination.
  This regular expression is matched against the first line of a file
! to determine the file's mode in `set-auto-mode'.  If it matches, the file
! is assumed to be interpreted by the interpreter matched by the second group
! of the regular expression.  The mode is then determined as the mode
! associated with that interpreter in `interpreter-mode-alist'.")
  
  (defvar magic-mode-alist
    `(;; The < comes before the groups (but the first) to reduce backtracking.