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

[Richard M . Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.773 emacs/lisp/files.el:1.774
*** emacs/lisp/files.el:1.773   Tue May 31 13:26:21 2005
--- emacs/lisp/files.el Mon Jun  6 12:31:48 2005
***************
*** 658,664 ****
  
  (defun locate-file-completion (string path-and-suffixes action)
    "Do completion for file names passed to `locate-file'.
! PATH-AND-SUFFIXES is a pair of lists (DIRECTORIES . SUFFIXES)."
    (if (file-name-absolute-p string)
        (read-file-name-internal string nil action)
      (let ((names nil)
--- 658,664 ----
  
  (defun locate-file-completion (string path-and-suffixes action)
    "Do completion for file names passed to `locate-file'.
! PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
    (if (file-name-absolute-p string)
        (read-file-name-internal string nil action)
      (let ((names nil)
***************
*** 2159,2167 ****
         (goto-char beg)
         end))))
  
! (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))
--- 2159,2167 ----
         (goto-char beg)
         end))))
  
! (defun hack-local-variables-confirm (string flag-to-check)
!   (or (eq flag-to-check t)
!       (and flag-to-check
           (save-window-excursion
             (condition-case nil
                 (switch-to-buffer (current-buffer))
***************
*** 2236,2242 ****
        (if (and result
                 (or mode-only
                     (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)))
--- 2236,2243 ----
        (if (and result
                 (or mode-only
                     (hack-local-variables-confirm
!                     "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)))
***************
*** 2267,2273 ****
              (and (search-forward "Local Variables:" nil t)
                   (or mode-only
                       (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.
--- 2268,2275 ----
              (and (search-forward "Local Variables:" nil t)
                   (or mode-only
                       (hack-local-variables-confirm
!                       "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.
***************
*** 2489,2495 ****
                 ;; 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? ")))
             (if (eq var 'eval)
                 (save-excursion (eval val))
               (make-local-variable var)
--- 2491,2498 ----
                 ;; 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? "
!                      enable-local-eval)))
             (if (eq var 'eval)
                 (save-excursion (eval val))
               (make-local-variable var)