(large-file-warning-threshold): Add type, groups.

diff --git a/lisp/files.el b/lisp/files.el
index 42a29f0b2b7d785a8d5e8bbaeee99b219d53fe88..7ce59dd603525105ca55ad1a52d33856b5c71198 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1173,8 +1173,11 @@ suppresses this warning."
   :type 'boolean)
 
 (defcustom large-file-warning-threshold 10000000
-  "Maximum size of file above which a confirmation is requested."
-  :type 'integer)
+  "Maximum size of file above which a confirmation is requested.
+When nil, never request confirmation."
+  :group 'files
+  :group 'find-file
+  :type '(choice integer (const :tag "Never request confirmation" nil)))
 
 (defun find-file-noselect (filename &optional nowarn rawfile wildcards)
   "Read file FILENAME into a buffer and return the buffer.

diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 5f1bed747709cfb4fa966cc664635cf0ab4dcb7b..6fae66ef455ec9a42814260c732f2ff2ee5a4161 100644 (file)
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -65,7 +65,7 @@
 (provide 'delphi)
 
 (defconst delphi-version
-  (let ((revision "$Revision: 3.8 $"))
+  (let ((revision "$Revision: 3.9 $"))
     (string-match ": \\([^ ]+\\)" revision)
     (match-string 1 revision))
   "Version of this delphi mode.")
@@ -742,7 +742,7 @@ routine.")
         (delphi-step-progress p "Fontifying" delphi-fontifying-progress-step))
       (delphi-progress-done)))))
 
-(defconst delphi-ignore-changes t
+(defvar delphi-ignore-changes t
   "Internal flag to control if the delphi-mode responds to buffer changes.
 Defaults to t in case the delphi-after-change function is called on a
 non-delphi buffer. Set to nil in a delphi buffer.  To override, just do: