X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a3e44e793796153ff1534be9c74fcab50b45de30..a3dae87a1b5405d2bffde7c2d829a5dbfc7ff274:/lisp/cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 63cea87168..389716b35b 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,7 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -112,9 +111,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	     (cursor-in-non-selected-windows
 	      cursor boolean nil
 	      :tag "Cursor In Non-selected Windows"
-	      :set #'(lambda (symbol value)
-		       (set-default symbol value)
-		       (force-mode-line-update t)))
+	      :set (lambda (symbol value)
+		     (set-default symbol value)
+		     (force-mode-line-update t)))
 	     (transient-mark-mode editing-basics boolean nil
 				  :standard (not noninteractive)
 				  :initialize custom-initialize-delay
@@ -167,12 +166,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	     (max-mini-window-height limits
 				     (choice (const :tag "quarter screen" nil)
 					     number) "23.1")
-	     (stack-trace-on-error debug
-				   (choice (const :tag "off")
-					   (repeat :menu-tag "When"
-						   :value (nil)
-						   (symbol :format "%v"))
-					   (const :tag "always" t)))
 	     (debug-on-error debug
 			     (choice (const :tag "off")
 				     (repeat :menu-tag "When"
@@ -266,6 +259,11 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	     (suggest-key-bindings keyboard (choice (const :tag "off" nil)
 						    (integer :tag "time" 2)
 						    (other :tag "on")))
+             (debug-on-event debug
+                             (choice (const :tag "None" nil)
+                                     (const :tag "When sent SIGUSR1" sigusr1)
+                                     (const :tag "When sent SIGUSR2" sigusr2))
+                             "24.1")
 
 ;; This is not good news because it will use the wrong
 ;; version-specific directories when you upgrade.  We need
@@ -363,6 +361,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 		      (const alt) (const hyper)
 		      (const super)) "23.1")
 	     (ns-antialias-text ns boolean "23.1")
+	     (ns-auto-hide-menu-bar ns boolean "24.0")
 	     ;; process.c
 	     (delete-exited-processes processes-basics boolean)
 	     ;; syntax.c
@@ -389,19 +388,18 @@ since it could result in memory overflow and make Emacs crash."
 	     ;; window.c
 	     (temp-buffer-show-function windows (choice (const nil) function))
 	     (next-screen-context-lines windows integer)
-	     (window-min-height windows integer)
-	     (window-min-width windows integer)
  	     (scroll-preserve-screen-position
  	      windows (choice
  		       (const :tag "Off (nil)" :value nil)
  		       (const :tag "Full screen (t)" :value t)
  		       (other :tag "Always" 1)) "22.1")
-	     (recenter-redisplay windows
-				 (choice
-				  (const :tag "Never (nil)" :value nil)
-				  (const :tag "Only on ttys" :value tty)
-				  (other :tag "Always" t))
-				 "23.1")
+	     (recenter-redisplay
+	      windows (choice
+		       (const :tag "Never (nil)" :value nil)
+		       (const :tag "Only on ttys" :value tty)
+		       (other :tag "Always" t)) "23.1")
+	     (window-splits windows boolean "24.1")
+	     (window-nest windows boolean "24.1")
 	     ;; xdisp.c
 	     (show-trailing-whitespace whitespace-faces boolean nil
 				       :safe booleanp)