Un-mung previous erc-log change (error due to committer, not author)

[bpt/emacs.git] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c5f7f5b..28c1d3e 100644 (file)
--- 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