diff options
| author | Richard M. Stallman <rms@gnu.org> | 2004-12-30 01:49:38 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2004-12-30 01:49:38 +0000 |
| commit | c4cb00d05e5e3a227681de41a4aef0067bce106a (patch) | |
| tree | fddf39bc55ed1f5ec76863c4040d7c8a098be6b7 /lisp | |
| parent | de653a636e5a420096829e393d6cc40f5bc545ac (diff) | |
| download | emacs-c4cb00d05e5e3a227681de41a4aef0067bce106a.tar.gz | |
(hack-local-variables): If there is no PREFIX, set it to "^".
Redundant variable PREFIXLEN removed.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/files.el | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75c30b56643..25194e149ac 100644 --- 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 b7cf3e78665..441a230163e 100644 --- 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)) |