X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0c3461de8684836598f5ef3d32161deb84df2443..7b1bf1735e58fbadbe180d4bbbe3a00cf71baed4:/lisp/cus-start.el?ds=sidebyside

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c5f7f5b3d3..2279dc2bf2 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -204,7 +204,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	     (delete-by-moving-to-trash auto-save boolean "23.1")
 	     (auto-save-visited-file-name auto-save boolean)
 	     ;; filelock.c
-	     (create-lockfiles files boolean "24.2")
+	     (create-lockfiles files boolean "24.3")
 	     (temporary-file-directory
 	      ;; Darwin section added 24.1, does not seem worth :version bump.
 	      files directory nil
@@ -422,7 +422,17 @@ since it could result in memory overflow and make Emacs crash."
 		       (const :tag "Only on ttys" :value tty)
 		       (other :tag "Always" t)) "23.1")
 	     (window-combination-resize windows boolean "24.1")
-	     (window-combination-limit windows boolean "24.1")
+	     (window-combination-limit
+	      windows (choice
+		       (const :tag "Never (nil)" :value nil)
+		       (const :tag "For Temp Buffer Resize mode (temp-buffer-resize)"
+			      :value temp-buffer-resize)
+		       (const :tag "For temporary buffers (temp-buffer)"
+			      :value temp-buffer)
+		       (const :tag "For buffer display (display-buffer)"
+			      :value display-buffer)
+		       (other :tag "Always (t)" :value t))
+	      "24.3")
 	     ;; xdisp.c
 	     (show-trailing-whitespace whitespace-faces boolean nil
 				       :safe booleanp)
@@ -433,7 +443,6 @@ since it could result in memory overflow and make Emacs crash."
 	     (hscroll-step windows number "22.1")
 	     (truncate-partial-width-windows display boolean "23.1")
 	     (make-cursor-line-fully-visible windows boolean)
-	     (mode-line-inverse-video mode-line boolean)
 	     (mode-line-in-non-selected-windows mode-line boolean "22.1")
 	     (line-number-display-limit display
 					(choice integer
@@ -443,7 +452,8 @@ since it could result in memory overflow and make Emacs crash."
 	     (message-log-max debug (choice (const :tag "Disable" nil)
 					    (integer :menu-tag "lines"
 						     :format "%v")
-					    (other :tag "Unlimited" t)))
+					    (other :tag "Unlimited" t))
+			      "24.3")
 	     (unibyte-display-via-language-environment mule boolean)
 	     (blink-cursor-alist cursor alist "22.1")
 	     (overline-margin display integer "22.1")
@@ -477,7 +487,6 @@ since it could result in memory overflow and make Emacs crash."
 	     (hourglass-delay cursor number)
 
 	     ;; xfaces.c
-	     (font-list-limit display integer)
 	     (scalable-fonts-allowed display boolean "22.1")
 	     ;; xfns.c
 	     (x-bitmap-file-path installation