'enable-local-eval' ignored in current cvs

[Matthias Förste]

When loading a file containing an 'eval' file local variable the value
of this variable is always evaluated ignoring the setting of the
'enable-local-eval' variable.

Index: lisp/files.el
===================================================================
--- lisp/files.el       (revision 46)
+++ lisp/files.el       (revision 47)
@@ -2155,9 +2155,9 @@
        (goto-char beg)
        end))))
 
-(defun hack-local-variables-confirm (string)
-  (or (eq enable-local-variables t)
-      (and enable-local-variables
+(defun hack-local-variables-confirm (string check)
+  (or (eq check t)
+      (and check
           (save-window-excursion
             (condition-case nil
                 (switch-to-buffer (current-buffer))
@@ -2232,7 +2232,7 @@
        (if (and result
                 (or mode-only
                     (hack-local-variables-confirm
-                     "Set local variables as specified in -*- line of %s? ")))
+                     "Set local variables as specified in -*- line of %s? " 
enable-local-variables)))
            (let ((enable-local-eval enable-local-eval))
              (while result
                (hack-one-local-variable (car (car result)) (cdr (car result)))
@@ -2263,7 +2263,7 @@
              (and (search-forward "Local Variables:" nil t)
                   (or mode-only
                       (hack-local-variables-confirm
-                       "Set local variables as specified at end of %s? "))))
+                       "Set local variables as specified at end of %s? " 
enable-local-variables))))
        (skip-chars-forward " \t")
        (let ((enable-local-eval enable-local-eval)
              ;; suffix is what comes after "local variables:" in its line.
@@ -2485,7 +2485,7 @@
                 ;; Permit eval if not root and user says ok.
                 (and (not (zerop (user-uid)))
                      (hack-local-variables-confirm
-                      "Process `eval' or hook local variables in %s? ")))
+                      "Process `eval' or hook local variables in %s? " 
enable-local-eval)))
             (if (eq var 'eval)
                 (save-excursion (eval val))
               (make-local-variable var)

In GNU Emacs 22.0.50.1 (i686-pc-linux-gnu, GTK+ Version 2.6.4)
 of 2005-05-28 on matthi
Distributor `Gentoo (The X.Org Foundation 6.8.2, revision r1-0.1.2)', version 
11.0.60802000
configured using `configure '--prefix=/usr' '--host=i686-pc-linux-gnu' 
'--mandir=/usr/share/man' '--infodir=/usr/share/info' '--datadir=/usr/share' 
'--sysconfdir=/etc' '--localstatedir=/var/lib' '--enable-debug' 
'--program-suffix=.emacs-22.0.50' '--without-carbon' '--with-x' '--with-xpm' 
'--with-toolkit-scroll-bars' '--with-jpeg' '--with-tiff' '--with-gif' 
'--with-png' '--with-x-toolkit=gtk' 'CFLAGS= -O2' 
'host_alias=i686-pc-linux-gnu''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: address@hidden
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  locale-coding-system: iso-8859-15
  default-enable-multibyte-characters: t

Major mode: Group

Minor modes in effect:
  gnus-undo-mode: t
  delete-selection-mode: t
  mouse-wheel-mode: t
  tooltip-mode: t
  auto-compression-mode: t
  menu-bar-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t
  next-error-follow-minor-mode:  Fol

Recent input:
C-d C-e SPC b e i n g SPC i g n o r e d C-n C-n C-c 
C-c C-x 4 f / u <tab> <tab> p <tab> d <tab> i <tab> 
c v <tab> <tab> s <tab> <tab> <tab> e <tab> <tab> <tab> 
C <tab> V <tab> <tab> <tab> R <tab> e <tab> <return> 
C-x k <return> C-x C-f M-p <M-backspace> <tab> <tab> 
R <tab> o <tab> <return> C-x k <return> M-x g n <tab> 
<return> <return> <return> SPC SPC SPC SPC B m B <tab> 
<return> q <return> q <help-echo> <help-echo> <help-echo> 
<help-echo> <help-echo> <menu-bar> <help-menu> <re
port-emacs-bug>

Recent messages:
Exiting summary buffer and applying spam rules
Registering 1 specific articles as spam using backend spam-use-bogofilter
1 spam messages were registered by backend spam-use-bogofilter.
Registering 1 specific articles as spam using backend spam-use-move
Moving to nnml:spam: (7167)...
Wrote /home/matthi/.gnus/Mail/spam/7168
Registry: article <address@hidden> going from nnml:spam to nnml:spam
1 spam messages were registered by backend spam-use-move.
Auto-saving...
Loading emacsbug...done