diff options
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 1e2dd6c57af..fd5a62f0c1b 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -35,10 +35,7 @@ ;;; Code: -(let ((all '(;; abbrev.c - (abbrev-all-caps abbrev-mode boolean) - (pre-abbrev-expand-hook abbrev-mode hook) - ;; alloc.c +(let ((all '(;; alloc.c (gc-cons-threshold alloc integer) (garbage-collection-messages alloc boolean) ;; buffer.c @@ -142,6 +139,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; eval.c (max-specpdl-size limits integer) (max-lisp-eval-depth limits integer) + (max-mini-window-height limits + (choice (const :tag "quarter screen" nil) + number)) (stack-trace-on-error debug (choice (const :tag "off") (repeat :menu-tag "When" @@ -340,6 +340,15 @@ since it could result in memory overflow and make Emacs crash." (even-window-heights windows boolean) (next-screen-context-lines windows integer) (split-height-threshold windows integer) + (split-window-preferred-function + windows + (choice (const :tag "vertically" split-window) + ;; FIXME: Add `sensibly' which chooses between + ;; vertical or horizontal splits depending on the size + ;; and shape of the window. + (const :tag "horizontally" + (lambda (window) + (split-window window nil 'horiz))))) (window-min-height windows integer) (window-min-width windows integer) (scroll-preserve-screen-position @@ -420,14 +429,10 @@ since it could result in memory overflow and make Emacs crash." (eq system-type 'ms-dos)) ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) - ((string-match "\\`mac-" (symbol-name symbol)) - (eq window-system 'mac)) + ((string-match "\\`mac-" (symbol-name symbol)) + (featurep 'mac-carbon)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) - (or (boundp 'gtk) - (and window-system - (not (eq window-system 'pc)) - (not (eq window-system 'mac)) - (not (eq system-type 'windows-nt))))) + (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) ((string-match "selection" (symbol-name symbol)) @@ -466,5 +471,5 @@ since it could result in memory overflow and make Emacs crash." (unless purify-flag (provide 'cus-start)) -;;; arch-tag: 4502730d-bcb3-4f5e-99a3-a86f2d54af60 +;; arch-tag: 4502730d-bcb3-4f5e-99a3-a86f2d54af60 ;;; cus-start.el ends here |