aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-05-14 00:56:30 +0000
committerLuc Teirlinck2005-05-14 00:56:30 +0000
commit54005870a2197b6599734297cb2f46dbadc10558 (patch)
tree568f14a23c15c11f6caa254cf8ca43eb4f79b21e
parent522e224056c0cb366fb8081260c43634a17cbb38 (diff)
downloademacs-54005870a2197b6599734297cb2f46dbadc10558.tar.gz
emacs-54005870a2197b6599734297cb2f46dbadc10558.zip
(interpreter-mode-alist, auto-mode-interpreter-regexp): Doc fixes.
-rw-r--r--lisp/files.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 16438b78073..50359d635a8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -541,7 +541,7 @@ DIR should be an absolute directory name. It defaults to
541the value of `default-directory'." 541the value of `default-directory'."
542 (unless dir 542 (unless dir
543 (setq dir default-directory)) 543 (setq dir default-directory))
544 (read-file-name prompt dir (or default-dirname 544 (read-file-name prompt dir (or default-dirname
545 (if initial (expand-file-name initial dir) 545 (if initial (expand-file-name initial dir)
546 dir)) 546 dir))
547 mustmatch initial 547 mustmatch initial
@@ -1944,7 +1944,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
1944 "Alist mapping interpreter names to major modes. 1944 "Alist mapping interpreter names to major modes.
1945This is used for files whose first lines match `auto-mode-interpreter-regexp'. 1945This is used for files whose first lines match `auto-mode-interpreter-regexp'.
1946Each element looks like (INTERPRETER . MODE). 1946Each element looks like (INTERPRETER . MODE).
1947The car of each element is compared with 1947The car of each element, a regular expression, is compared with
1948the name of the interpreter specified in the first line. 1948the name of the interpreter specified in the first line.
1949If it matches, mode MODE is selected. 1949If it matches, mode MODE is selected.
1950 1950
@@ -1961,13 +1961,12 @@ from the end of the file name anything that matches one of these regexps.")
1961(defvar auto-mode-interpreter-regexp 1961(defvar auto-mode-interpreter-regexp
1962 "#![ \t]?\\([^ \t\n]*\ 1962 "#![ \t]?\\([^ \t\n]*\
1963/bin/env[ \t]\\)?\\([^ \t\n]+\\)" 1963/bin/env[ \t]\\)?\\([^ \t\n]+\\)"
1964 "Regular expression matching interpreters, for file mode determination. 1964 "Regexp matching interpreters, for file mode determination.
1965This regular expression is matched against the first line of a file 1965This regular expression is matched against the first line of a file
1966to determine the file's mode in `set-auto-mode' when Emacs can't deduce 1966to determine the file's mode in `set-auto-mode'. If it matches, the file
1967a mode from the file's name. If it matches, the file is assumed to 1967is assumed to be interpreted by the interpreter matched by the second group
1968be interpreted by the interpreter matched by the second group of the 1968of the regular expression. The mode is then determined as the mode
1969regular expression. The mode is then determined as the mode associated 1969associated with that interpreter in `interpreter-mode-alist'.")
1970with that interpreter in `interpreter-mode-alist'.")
1971 1970
1972(defvar magic-mode-alist 1971(defvar magic-mode-alist
1973 `(;; The < comes before the groups (but the first) to reduce backtracking. 1972 `(;; The < comes before the groups (but the first) to reduce backtracking.