diff options
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index c0a4a6dda06..19975307894 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -36,7 +36,7 @@ (defun minibuffer-prompt-properties--setter (symbol value) (set-default symbol value) (if (memq 'cursor-intangible value) - (add-hook 'minibuffer-setup-hook 'cursor-intangible-mode) + (add-hook 'minibuffer-setup-hook #'cursor-intangible-mode) ;; Removing it is a bit trickier since it could have been added by someone ;; else as well, so let's just not bother. )) @@ -285,6 +285,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") ;; See bug#7135. (let* (file-name-handler-alist + (default-directory "/") (tmp (ignore-errors (shell-command-to-string "getconf DARWIN_USER_TEMP_DIR")))) @@ -302,10 +303,11 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; fns.c (use-dialog-box menu boolean "21.1") (use-file-dialog menu boolean "22.1") + (use-short-answers menu boolean "28.1") (focus-follows-mouse frames (choice - (const :tag "Off (nil)" :value nil) - (const :tag "On (t)" :value t) + (const :tag "Off" :value nil) + (const :tag "On" :value t) (const :tag "Auto-raise" :value auto-raise)) "26.1") ;; fontset.c ;; FIXME nil is the initial value, fontset.el setqs it. @@ -429,6 +431,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of "21.1" :set minibuffer-prompt-properties--setter) (minibuffer-auto-raise minibuffer boolean) + (read-minibuffer-restore-windows minibuffer boolean "28.1") ;; options property set at end (read-buffer-function minibuffer (choice (const nil) @@ -601,27 +604,29 @@ since it could result in memory overflow and make Emacs crash." (next-screen-context-lines 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") + (const :tag "Off" :value nil) + (const :tag "Full screen" :value t) + (other :tag "Always" 1)) + "22.1") (recenter-redisplay windows (choice - (const :tag "Never (nil)" :value nil) + (const :tag "Never" :value nil) (const :tag "Only on ttys" :value tty) - (other :tag "Always" t)) "23.1") + (other :tag "Always" t)) + "23.1") (window-combination-resize windows boolean "24.1") (window-combination-limit windows (choice - (const :tag "Never (nil)" :value nil) - (const :tag "If requested via buffer display alist (window-size)" + (const :tag "Never" :value nil) + (const :tag "If requested via buffer display alist" :value window-size) - (const :tag "With Temp Buffer Resize mode (temp-buffer-resize)" + (const :tag "With Temp Buffer Resize mode" :value temp-buffer-resize) - (const :tag "For temporary buffers (temp-buffer)" + (const :tag "For temporary buffers" :value temp-buffer) - (const :tag "For buffer display (display-buffer)" + (const :tag "For buffer display" :value display-buffer) - (other :tag "Always (t)" :value t)) + (other :tag "Always" :value t)) "26.1") (fast-but-imprecise-scrolling scrolling boolean "25.1") (window-resize-pixelwise windows boolean "24.4") @@ -629,6 +634,12 @@ since it could result in memory overflow and make Emacs crash." ;; The whitespace group is for whitespace.el. (show-trailing-whitespace editing-basics boolean nil :safe booleanp) + (mode-line-compact + mode-line + (choice (const :tag "Never" :value nil) + (const :tag "Only if wider than window" :value long) + (const :tag "Always" :value t)) + "28.1") (scroll-step windows integer) (scroll-conservatively windows integer) (scroll-margin windows integer) @@ -666,7 +677,7 @@ since it could result in memory overflow and make Emacs crash." (underline-minimum-offset display integer "23.1") (mouse-autoselect-window display (choice - (const :tag "Off (nil)" :value nil) + (const :tag "Off" :value nil) (const :tag "Immediate" :value t) (number :tag "Delay by secs" :value 0.5)) "22.1") (tool-bar-style @@ -711,15 +722,15 @@ since it could result in memory overflow and make Emacs crash." (hourglass-delay cursor number) (resize-mini-windows windows (choice - (const :tag "Off (nil)" :value nil) - (const :tag "Fit (t)" :value t) + (const :tag "Off" :value nil) + (const :tag "Fit" :value t) (const :tag "Grow only" :value grow-only)) "25.1") (display-raw-bytes-as-hex display boolean "26.1") (display-line-numbers display-line-numbers (choice - (const :tag "Off (nil)" :value nil) + (const :tag "Off" :value nil) (const :tag "Absolute line numbers" :value t) (const :tag "Relative line numbers" |