emacs: lisp/files.el comparison

comparison lisp/files.el @ 90182:f042e7c0fe20

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 302-319) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 69) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Fri, 20 May 2005 04:22:05 +0000
parents	62afea0771d8 a7e02ef1e3d6
children	5b029ff3b08d

comparison

equal deleted inserted replaced

-:0c828e2b0b6f
+:f042e7c0fe20
 Fifth arg INITIAL specifies text to start with.
 DIR should be an absolute directory name.  It defaults to
 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
 		  'file-directory-p))
 `enable-local-variables' is ignored if you run `normal-mode' interactively,
 or from Lisp without specifying the optional argument FIND-FILE;
 in that case, this function acts as if `enable-local-variables' were t."
 (interactive)
 (or find-file (funcall (or default-major-mode 'fundamental-mode)))
-(report-errors "File mode specification error: %s"
+(let ((enable-local-variables (or (not find-file) enable-local-variables)))
-(set-auto-mode))
+(report-errors "File mode specification error: %s"
-(report-errors "File local-variables error: %s"
+(set-auto-mode))
-(let ((enable-local-variables (or (not find-file) enable-local-variables)))
+(report-errors "File local-variables error: %s"
 (hack-local-variables)))
 (if (fboundp 'ucs-set-table-for-input) ; don't lose when building
 (ucs-set-table-for-input)))
 (defvar auto-mode-alist
 ("\\.p\\'" . pascal-mode)
 ("\\.pas\\'" . pascal-mode)
 ("\\.ad[abs]\\'" . ada-mode)
 ("\\.ad[bs].dg\\'" . ada-mode)
 ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode)
-("\\.mk\\'" . makefile-mode)
+("\\.mk\\'" . makefile-gmake-mode)	; Might be any make, give Gnu the host advantage
-("\\([Mm]\\|GNUm\\)akep*file\\'" . makefile-mode)
+("[Mm]akefile\\'" . makefile-mode)
-("\\.am\\'" . makefile-mode)	;For Automake.
+("GNUmakefile\\'" . makefile-gmake-mode)
+("Makeppfile\\'" . makefile-makepp-mode)
+("\\.am\\'" . makefile-automake-mode)
 ;; Less common extensions come here
 ;; so more common ones above are found faster.
 ("\\.texinfo\\'" . texinfo-mode)
 ("\\.te?xi\\'" . texinfo-mode)
 ("\\.[sS]\\'" . asm-mode)
 ("zsh" . sh-mode)
 ("tail" . text-mode)
 ("more" . text-mode)
 ("less" . text-mode)
 ("pg" . text-mode)
-("make" . makefile-mode)		; Debian uses this
+("make" . makefile-gmake-mode)		; Debian uses this
 ("guile" . scheme-mode)
 ("clisp" . lisp-mode)))
 "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 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.
 See also `auto-mode-alist'.")
 from the end of the file name anything that matches one of these regexps.")
 (defvar auto-mode-interpreter-regexp
 "#![ \t]?\\([^ \t\n]*\
 /bin/env[ \t]\\)?\\([^ \t\n]+\\)"
-"Regular expression matching interpreters, for file mode determination.
+"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' when Emacs can't deduce
+to determine the file's mode in `set-auto-mode'.  If it matches, the file
-a mode from the file's name.  If it matches, the file is assumed to
+is assumed to be interpreted by the interpreter matched by the second group
-be interpreted by the interpreter matched by the second group of the
+of the regular expression.  The mode is then determined as the mode
-regular expression.  The mode is then determined as the mode associated
+associated with that interpreter in `interpreter-mode-alist'.")
-with that interpreter in `interpreter-mode-alist'.")
 (defvar magic-mode-alist
 `(;; The < comes before the groups (but the first) to reduce backtracking.
 ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff.
 (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
 if REGEXP matches the text at the beginning of the buffer,
 `normal-mode' will call FUNCTION rather than allowing `auto-mode-alist'
 to decide the buffer's major mode.
 If FUNCTION is nil, then it is not called.  (That is a way of saying
-\"allow `auto-mode-alist' to decide for these files.")
+\"allow `auto-mode-alist' to decide for these files.)")
 (defun set-auto-mode (&optional keep-mode-if-same)
 "Select major mode appropriate for current buffer.
 This checks for a -*- mode tag in the buffer's text, checks the
 (skip-chars-backward " \t")
 (setq end (point))
 (goto-char beg)
 end))))
-(defun hack-local-variables-confirm ()
+(defun hack-local-variables-confirm (string)
 (or (eq enable-local-variables t)
 (and enable-local-variables
 	   (save-window-excursion
 	     (condition-case nil
 		 (switch-to-buffer (current-buffer))
 		  ;; be undone by save-window-excursion.
 		  (pop-to-buffer (current-buffer)))))
 	     (save-excursion
 	       (beginning-of-line)
 	       (set-window-start (selected-window) (point)))
-	     (y-or-n-p (format "Set local variables as specified in -*- line of %s? "
+	     (y-or-n-p (format string
-			       (file-name-nondirectory buffer-file-name)))))))
+			       (if buffer-file-name
+				   (file-name-nondirectory buffer-file-name)
+				 (concat "buffer " (buffer-name)))))))))
 (defun hack-local-variables-prop-line (&optional mode-only)
 "Set local variables specified in the -*- line.
 Ignore any specification for `mode:' and `coding:';
 `set-auto-mode' should already have handled `mode:',
 	     (setq result (nreverse result))))
 (if mode-only mode-specified
 	(if (and result
 		 (or mode-only
-		     (hack-local-variables-confirm)))
+		     (hack-local-variables-confirm
+		      "Set local variables as specified in -*- line of %s? ")))
 	    (let ((enable-local-eval enable-local-eval))
 	      (while result
 		(hack-one-local-variable (car (car result)) (cdr (car result)))
 		(setq result (cdr result)))))
 	nil))))
 (goto-char (point-max))
 (search-backward "\n\^L" (max (- (point-max) 3000) (point-min)) 'move)
 (when (let ((case-fold-search t))
 	      (and (search-forward "Local Variables:" nil t)
 		   (or mode-only
-		       (hack-local-variables-confirm))))
+		       (hack-local-variables-confirm
+			"Set local variables as specified at end of %s? "))))
 	(skip-chars-forward " \t")
 	(let ((enable-local-eval enable-local-eval)
 	      ;; suffix is what comes after "local variables:" in its line.
 	      (suffix
 	       (concat
 	 ;; if the args do nothing tricky.
 	 (if (or (and (eq var 'eval)
 		      (hack-one-local-variable-eval-safep val))
 		 ;; Permit eval if not root and user says ok.
 		 (and (not (zerop (user-uid)))
-		      (hack-local-variables-confirm)))
+		      (hack-local-variables-confirm
+		       "Process `eval' or hook local variables in %s? ")))
 	     (if (eq var 'eval)
 		 (save-excursion (eval val))
 	       (make-local-variable var)
 	       (set var val))
 	   (message "Ignoring risky spec in the local variables list")))
 "Given the name of a numeric backup file, FN, return the backup number.
 Uses the free variable `backup-extract-version-start', whose value should be
 the index in the name where the version number begins."
 (if (and (string-match "[0-9]+~$" fn backup-extract-version-start)
 	   (= (match-beginning 0) backup-extract-version-start))
-(string-to-int (substring fn backup-extract-version-start -1))
+(string-to-number (substring fn backup-extract-version-start -1))
 0))
 ;; I believe there is no need to alter this behavior for VMS;
 ;; since backup files are not made on VMS, it should not get called.
 (defun find-backup-file-name (fn)
 		     (call-process "ls" nil t nil "--version")
 		     (buffer-string))))
 	      (if (string-match "ls (.*utils) \\([0-9.]*\\)$" version-out)
 		  (let* ((version (match-string 1 version-out))
 			 (split (split-string version "[.]"))
-			 (numbers (mapcar 'string-to-int split))
+			 (numbers (mapcar 'string-to-number split))
 			 (min '(5 2 1))
 			 comparison)
 		    (while (and (not comparison) (or numbers min))
 		      (cond ((null min)
 			     (setq comparison '>))

Mercurial > emacs

comparison lisp/files.el @ 90182:f042e7c0fe20