aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorKaroly Lorentey2006-10-14 17:36:28 +0000
committerKaroly Lorentey2006-10-14 17:36:28 +0000
commit12b6af5c7ed2cfdb9783312bf890cf1e6c80c67a (patch)
tree1775f9fd1c92defd8b61304a08ec00da95bc4539 /lisp/cus-start.el
parent3f87f67ee215ffeecbd2f53bd7f342cdf03f47df (diff)
parentf763da8d0808af7c80d72bc586bf4fcf50b37ddd (diff)
downloademacs-12b6af5c7ed2cfdb9783312bf890cf1e6c80c67a.tar.gz
emacs-12b6af5c7ed2cfdb9783312bf890cf1e6c80c67a.zip
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-413 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-414 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-415 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-416 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-417 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-418 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-419 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-420 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-421 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-422 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-423 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-424 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-425 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-426 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-427 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-428 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-429 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-430 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-431 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-432 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-433 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-434 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-435 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-436 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-437 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-438 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-439 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-440 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-441 lisp/url/url-methods.el: Fix format error when http_proxy is empty string * emacs@sv.gnu.org/emacs--devo--0--patch-442 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-443 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-444 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-445 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-446 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-447 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-448 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-449 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-450 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-451 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-452 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-453 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-454 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-455 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-456 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-457 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-458 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-459 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-460 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-461 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-462 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-463 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-464 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-465 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-466 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-467 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-468 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-469 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-470 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-471 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-472 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-473 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-128 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-129 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-130 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-131 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-132 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-133 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-134 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-135 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-136 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-137 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-138 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-139 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-140 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-141 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-142 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-143 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-144 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-145 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-146 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-147 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-148 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-149 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-582
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el17
1 files changed, 11 insertions, 6 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b59cb57aaf6..15f314d75e7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -344,11 +344,11 @@ since it could result in memory overflow and make Emacs crash."
344 (scroll-step windows integer) 344 (scroll-step windows integer)
345 (scroll-conservatively windows integer) 345 (scroll-conservatively windows integer)
346 (scroll-margin windows integer) 346 (scroll-margin windows integer)
347 (hscroll-margin windows integer "21.3") 347 (hscroll-margin windows integer "22.1")
348 (hscroll-step windows number "21.3") 348 (hscroll-step windows number "22.1")
349 (truncate-partial-width-windows display boolean) 349 (truncate-partial-width-windows display boolean)
350 (mode-line-inverse-video modeline boolean) 350 (mode-line-inverse-video modeline boolean)
351 (mode-line-in-non-selected-windows modeline boolean "21.3") 351 (mode-line-in-non-selected-windows modeline boolean "22.1")
352 (line-number-display-limit display 352 (line-number-display-limit display
353 (choice integer 353 (choice integer
354 (const :tag "No limit" nil))) 354 (const :tag "No limit" nil)))
@@ -361,17 +361,22 @@ since it could result in memory overflow and make Emacs crash."
361 (unibyte-display-via-language-environment mule boolean) 361 (unibyte-display-via-language-environment mule boolean)
362 (blink-cursor-alist cursor alist "22.1") 362 (blink-cursor-alist cursor alist "22.1")
363 (overline-margin display integer "22.1") 363 (overline-margin display integer "22.1")
364 (mouse-autoselect-window
365 display (choice
366 (const :tag "Off (nil)" :value nil)
367 (const :tag "Immediate" :value t)
368 (number :tag "Delay by secs" :value 0.5)) "22.1")
364 ;; xfaces.c 369 ;; xfaces.c
365 (scalable-fonts-allowed display boolean) 370 (scalable-fonts-allowed display boolean)
366 ;; xfns.c 371 ;; xfns.c
367 (x-bitmap-file-path installation 372 (x-bitmap-file-path installation
368 (repeat (directory :format "%v"))) 373 (repeat (directory :format "%v")))
369 (x-use-old-gtk-file-dialog menu boolean "22.1") 374 (x-gtk-use-old-file-dialog menu boolean "22.1")
370 (x-gtk-show-hidden-files menu boolean "22.1") 375 (x-gtk-show-hidden-files menu boolean "22.1")
376 (x-gtk-file-dialog-help-text menu boolean "22.1")
371 (x-gtk-whole-detached-tool-bar x boolean "22.1") 377 (x-gtk-whole-detached-tool-bar x boolean "22.1")
372 ;; xterm.c 378 ;; xterm.c
373 (mouse-autoselect-window display boolean "21.3") 379 (x-use-underline-position-properties display boolean "22.1")
374 (x-use-underline-position-properties display boolean "21.3")
375 (x-underline-at-descent-line display boolean "22.1") 380 (x-underline-at-descent-line display boolean "22.1")
376 (x-stretch-cursor display boolean "21.1"))) 381 (x-stretch-cursor display boolean "21.1")))
377 this symbol group type standard version native-p 382 this symbol group type standard version native-p
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-26 16:21:59 +0000