(hack-local-variables): If there is no PREFIX, set it to "^".

Redundant variable PREFIXLEN removed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75c30b5664351d7c373338991441ca85736f131f..25194e149ac8f34f3d659e3636b4f82242b621b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-29  Milan Zamazal  <pdm@zamazal.org>
+
+       * files.el (hack-local-variables): If no PREFIX, set it to "^".
+       Redundant variable PREFIXLEN removed.
+
+2004-12-28  Matt Hodges  <MPHodges@member.fsf.org>
+
+       * eshell/em-hist.el (eshell-previous-matching-input):
+       Start the deletion from the end of the output.
+
 2004-12-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * term/mac-win.el: Require x-dnd.

diff --git a/lisp/files.el b/lisp/files.el
index b7cf3e78665f76881a87745a5f45abdb59b1a77a..441a230163e4b1b1d8165456b6104607ee6ab7cd 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2183,7 +2183,7 @@ is specified, returning t if it is specified."
                                                   buffer-file-name)
                                                (concat "buffer "
                                                        (buffer-name))))))))))
-         (let (prefix prefixlen suffix beg
+         (let (prefix suffix beg
                (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.
@@ -2197,8 +2197,7 @@ is specified, returning t if it is specified."
                      (buffer-substring (point)
                                        (progn (beginning-of-line) (point)))))
 
-           (if prefix (setq prefixlen (length prefix)
-                            prefix (regexp-quote prefix)))
+           (setq prefix (if prefix (regexp-quote prefix) "^"))
            (if suffix (setq suffix (concat (regexp-quote suffix) "$")))
            (forward-line 1)
            (let ((startpos (point))