(custom-save-delete): Move in front of local

variables, otherwise long Custom entries would make them
ineffective.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24b6ec8bb57d08b5cf5ec59cfe5f5b26e1abd8b9..8fde27aaa79a922c5c1d39bc7244248cf50abb36 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-03-07  Gerd Moellmann  <gerd@gnu.org>
 
+       * cus-edit.el (custom-save-delete): Move in front of local
+       variables, otherwise long Custom entries would make them
+       ineffective.
+
        * uniquify.el: Set maintainer to FSF.
 
 2001-03-07  Eli Zaretskii  <eliz@is.elta.co.il>

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 052b4ca2dee0b4a9074c9464b50f40682d16f0cb..6f0ca3a591b1236841803424719571233687b697 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,6 +1,6 @@
 ;;; cus-edit.el --- Tools for customizing Emacs and Lisp packages.
 ;;
-;; Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
@@ -3480,7 +3480,17 @@ or (if there were none) at the end of the buffer."
              (setq first (point)))))))
     (if first
        (goto-char first)
-      (goto-char (point-max)))))
+      ;; Move in front of local variables, otherwise long Custom
+      ;; entries would make them ineffective.
+      (let ((pos (point-max))
+           (case-fold-search t))
+       (save-excursion
+         (goto-char (point-max))
+         (search-backward "\n\^L" (max (- (point-max) 3000) (point-min))
+                          'move)
+         (when (search-forward "Local Variables:" nil t)
+           (setq pos (line-beginning-position))))
+       (goto-char pos)))))
 
 (defun custom-save-variables ()
   "Save all customized variables in `custom-file'."