emacs: lisp/files.el comparison

comparison lisp/files.el @ 89983:0796fc36c2bd

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-43 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-553 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-557 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-559 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-561 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Tue, 21 Sep 2004 09:34:12 +0000
parents	566253900690 996392344f62
children	e23928ac5a97

comparison

equal deleted inserted replaced

-:56440e073a4d
+:0796fc36c2bd
 (defcustom enable-local-eval 'maybe
 "*Control processing of the \"variable\" `eval' in a file's local variables.
 The value can be t, nil or something else.
 A value of t means obey `eval' variables;
-nil means ignore them; anything else means query.
+nil means ignore them; anything else means query."
-The command \\[normal-mode] always obeys local-variables lists
-and ignores this variable."
 :type '(choice (const :tag "Obey" t)
 		 (const :tag "Ignore" nil)
 		 (other :tag "Query" other))
 :group 'find-file)
 					      (if buffer-file-name
 						  (file-name-nondirectory
 						   buffer-file-name)
 						(concat "buffer "
 							(buffer-name))))))))))
-	  (let ((continue t)
+	  (let (prefix prefixlen suffix beg
-		prefix prefixlen suffix beg
-		mode-specified
 		(enable-local-eval enable-local-eval))
 	    ;; The prefix is what comes before "local variables:" in its line.
 	    ;; The suffix is what comes after "local variables:" in its line.
 	    (skip-chars-forward " \t")
 	    (or (eolp)
 					(progn (beginning-of-line) (point)))))
 	    (if prefix (setq prefixlen (length prefix)
 			     prefix (regexp-quote prefix)))
 	    (if suffix (setq suffix (concat (regexp-quote suffix) "$")))
-	    (while continue
+	    (forward-line 1)
-	      ;; Look at next local variable spec.
+	    (let ((startpos (point))
-	      (if selective-display (re-search-forward "[\n\C-m]")
+		  endpos
-		(forward-line 1))
+		  (thisbuf (current-buffer)))
-	      ;; Skip the prefix, if any.
+	      (save-excursion
-	      (if prefix
+		(if (not (re-search-forward
-		  (if (looking-at prefix)
+			  (concat (or prefix "")
-		      (forward-char prefixlen)
+				  "[ \t]*End:[ \t]*"
-		    (error "Local variables entry is missing the prefix")))
+				  (or suffix ""))
-	      ;; Find the variable name; strip whitespace.
+			  nil t))
-	      (skip-chars-forward " \t")
+		    (error "Local variables list is not properly terminated"))
-	      (setq beg (point))
+		(beginning-of-line)
-	      (skip-chars-forward "^:\n")
+		(setq endpos (point)))
-	      (if (eolp) (error "Missing colon in local variables entry"))
-	      (skip-chars-backward " \t")
+	      (with-temp-buffer
-	      (let* ((str (buffer-substring beg (point)))
+		(insert-buffer-substring thisbuf startpos endpos)
-		     (var (read str))
+		(goto-char (point-min))
-		    val)
+		(subst-char-in-region (point) (point-max)
-		;; Setting variable named "end" means end of list.
+				      ?\^m ?\n)
-		(if (string-equal (downcase str) "end")
+		(while (not (eobp))
-		    (setq continue nil)
+		  ;; Discard the prefix, if any.
-		  ;; Otherwise read the variable value.
+		  (if prefix
-		  (skip-chars-forward "^:")
+		      (if (looking-at prefix)
-		  (forward-char 1)
+			  (delete-region (point) (match-end 0))
-		  (setq val (read (current-buffer)))
+			(error "Local variables entry is missing the prefix")))
-		  (skip-chars-backward "\n")
+		  (end-of-line)
+		  ;; Discard the suffix, if any.
+		  (if suffix
+		      (if (looking-back suffix)
+			  (delete-region (match-beginning 0) (point))
+			(error "Local variables entry is missing the suffix")))
+		  (forward-line 1))
+		(goto-char (point-min))
+		(while (not (eobp))
+		  ;; Find the variable name; strip whitespace.
 		  (skip-chars-forward " \t")
-		  (or (if suffix (looking-at suffix) (eolp))
+		  (setq beg (point))
-		      (error "Local variables entry is terminated incorrectly"))
+		  (skip-chars-forward "^:\n")
-		  (if mode-only
+		  (if (eolp) (error "Missing colon in local variables entry"))
-		      (if (eq var 'mode)
+		  (skip-chars-backward " \t")
-			  (setq mode-specified t))
+		  (let* ((str (buffer-substring beg (point)))
-		    ;; Set the variable.  "Variables" mode and eval are funny.
+			 (var (read str))
-		    (hack-one-local-variable var val))))))))
+			 val)
+		    ;; Read the variable value.
+		    (skip-chars-forward "^:")
+		    (forward-char 1)
+		    (setq val (read (current-buffer)))
+		    (if mode-only
+			(if (eq var 'mode)
+			    (setq mode-specified t))
+		      ;; Set the variable.  "Variables" mode and eval are funny.
+		      (with-current-buffer thisbuf
+			(hack-one-local-variable var val))))
+		  (forward-line 1)))))))
 (unless mode-only
 (run-hooks 'hack-local-variables-hook))
 mode-specified))
-(defvar ignored-local-variables
+(defvar ignored-local-variables ()
-'(enable-local-eval)
 "Variables to be ignored in a file's local variable spec.")
 ;; Get confirmation before setting these variables as locals in a file.
 (put 'debugger 'risky-local-variable t)
 (put 'enable-local-eval 'risky-local-variable t)
 (defun risky-local-variable-p (sym &optional val)
 "Non-nil if SYM could be dangerous as a file-local variable with value VAL.
 If VAL is nil or omitted, the question is whether any value might be
 dangerous."
 (let ((safep (get sym 'safe-local-variable)))
-(or (memq sym ignored-local-variables)
+(or (get sym 'risky-local-variable)
-	(get sym 'risky-local-variable)
 	(and (string-match "-hooks?$\\|-functions?$\\|-forms?$\\|-program$\\|-command$\\|-predicate$\\|font-lock-keywords$\\|font-lock-keywords-[0-9]+$\\|font-lock-syntactic-keywords$\\|-frame-alist$\\|-mode-alist$\\|-map$\\|-map-alist$"
 			   (symbol-name sym))
 	     (not safep))
 	;; If the safe-local-variable property isn't t or nil,
 	;; then it must return non-nil on the proposed value to be safe.
 (cond ((eq var 'mode)
 	 (funcall (intern (concat (downcase (symbol-name val))
 				  "-mode"))))
 	((eq var 'coding)
 	 ;; We have already handled coding: tag in set-auto-coding.
+	 nil)
+	((memq var ignored-local-variables)
 	 nil)
 	;; "Setting" eval means either eval it or do nothing.
 	;; Likewise for setting hook variables.
 	((risky-local-variable-p var val)
 	 ;; Permit evalling a put of a harmless property.

Mercurial > emacs

comparison lisp/files.el @ 89983:0796fc36c2bd