(read-regexp): Add regexp for symbol at point to the defaults (Bug#13687).

[gnu-emacs] / lisp / files-x.el

diff --git a/lisp/files-x.el b/lisp/files-x.el
index a9c324771551a4499d4ed57f2bb1054aacd715b6..0ba245d423ab757c1e4fb2a39365030cccd7392b 100644 (file)
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -1,6 +1,6 @@
 ;;; files-x.el --- extended file handling commands
 
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 ;; Author: Juri Linkov <juri@jurta.org>
 ;; Maintainer: FSF
@@ -49,7 +49,7 @@ Intended to be used in the `interactive' spec of
             (format "%s: " prompt))
           obarray
           (lambda (sym)
-            (or (user-variable-p sym)
+            (or (custom-variable-p sym)
                  (get sym 'safe-local-variable)
                 (memq sym '(mode eval coding unibyte))))
           nil nil nil default nil))
@@ -149,7 +149,7 @@ from the Local Variables list ignoring the input argument VALUE."
 
        (goto-char (point-max))
        (let ((comment-style 'plain)
-             (comment-start (or comment-start ";;; ")))
+             (comment-start (or comment-start ";; ")))
          (comment-region
           (prog1 (setq beg (point))
             (insert "\nLocal Variables:\nEnd:\n"))
@@ -299,11 +299,11 @@ from the -*- line ignoring the input argument VALUE."
              (or (looking-at "[ \t]*\\([^ \t\n:]+\\)[ \t]*:[ \t]*")
                  (throw 'exit (message "Malformed -*- line")))
              (goto-char (match-end 0))
-             (let ((key (intern (match-string 1)))
-                   (val (save-restriction
-                          (narrow-to-region (point) end)
-                          (let ((read-circle nil))
-                            (read (current-buffer))))))
+             (let ((key (intern (match-string 1))))
+                (save-restriction
+                  (narrow-to-region (point) end)
+                  (let ((read-circle nil))
+                    (read (current-buffer))))
                (skip-chars-forward " \t;")
                (when (eq key variable)
                  (delete-region (match-beginning 0) (point))
@@ -344,6 +344,8 @@ then this function adds it."
    (list (read-file-local-variable "Delete -*- file-local variable")))
   (modify-file-local-variable-prop-line variable nil 'delete))
 
+(defvar auto-insert) ; from autoinsert.el
+
 (defun modify-dir-local-variable (mode variable value op)
   "Modify directory-local VARIABLE in .dir-locals.el depending on operation OP.