X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/43a8b8ca5797923a7a9848a513ecc8cfff655e17..ca0ebeccbbcbaa1877f8ca8cf131598f013e4f0a:/lisp/cus-start.el diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 8b900b697d..9237b78e91 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -1,17 +1,17 @@ ;;; cus-start.el --- define customization properties of builtins ;; ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Keywords: internal ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,9 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: ;; @@ -48,6 +46,7 @@ (tab-width editing-basics integer) (ctl-arrow display boolean) (truncate-lines display boolean) + (word-wrap display boolean) (selective-display-ellipses display boolean) (indicate-empty-lines fringe boolean) (indicate-buffer-boundaries @@ -95,9 +94,11 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (scroll-down-aggressively windows (choice (const :tag "off" nil) number) "21.1") - (line-spacing display (choice (const :tag "none" nil) integer)) + (line-spacing display (choice (const :tag "none" nil) integer) + "22.1") ;; callint.c (mark-even-if-inactive editing-basics boolean) + (shift-select-mode editing-basics boolean) ;; callproc.c (shell-file-name execute file) (exec-path execute @@ -128,7 +129,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of :match (lambda (widget value) (and value (not (functionp value))))) (function :value ignore)))) - (selection-coding-system mule coding-system) ;; dired.c (completion-ignored-extensions dired (repeat (string :format "%v"))) @@ -144,7 +144,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (max-lisp-eval-depth limits integer) (max-mini-window-height limits (choice (const :tag "quarter screen" nil) - number)) + number) "23.1") (stack-trace-on-error debug (choice (const :tag "off") (repeat :menu-tag "When" @@ -164,9 +164,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of :value (nil) (symbol :format "%v")) (const :tag "always" t))) - ;; fileio.c - (insert-default-directory minibuffer boolean) - (read-file-name-completion-ignore-case minibuffer boolean "22.1") + ;; fileio.c + (delete-by-moving-to-trash auto-save boolean "23.1") + (auto-save-visited-file-name auto-save boolean) ;; fns.c (use-dialog-box menu boolean "21.1") (use-file-dialog menu boolean "22.1") @@ -178,7 +178,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (sexp :tag "Value")))) (mouse-highlight mouse (choice (const :tag "disabled" nil) (const :tag "always shown" t) - (other :tag "hidden by keypress" 1))) + (other :tag "hidden by keypress" 1)) + "22.1") ;; fringe.c (overflow-newline-into-fringe fringe boolean) ;; indent.c @@ -192,7 +193,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (polling-period keyboard integer) (double-click-time mouse (restricted-sexp :match-alternatives (integerp 'nil 't))) - (double-click-fuzz mouse integer) + (double-click-fuzz mouse integer "22.1") (inhibit-local-menu-bar-menus menu boolean) (help-char keyboard character) (help-event-list keyboard (repeat (sexp :format "%v"))) @@ -200,42 +201,6 @@ 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"))) - ;; macselect.c - (mac-dnd-known-types mac (repeat string) "22.1") - ;; macterm.c - (mac-control-modifier mac (choice (const :tag "No modifier" nil) - (const control) (const meta) - (const alt) (const hyper) - (const super)) "22.1") - (mac-command-modifier mac (choice (const :tag "No modifier" nil) - (const control) (const meta) - (const alt) (const hyper) - (const super)) "22.1") - (mac-option-modifier mac (choice (const :tag "No modifier (work as option)" nil) - (const control) (const meta) - (const alt) (const hyper) - (const super)) "22.1") - (mac-function-modifier mac - (choice (const :tag "No modifier (work as function)" nil) - (const control) (const meta) - (const alt) (const hyper) - (const super)) "22.1") - (mac-emulate-three-button-mouse mac - (choice (const :tag "No emulation" nil) - (const :tag "Option->2, Command->3" t) - (const :tag "Command->2, Option->3" reverse)) - "22.1") - (mac-wheel-button-is-mouse-2 mac boolean "22.1") - (mac-pass-command-to-system mac boolean "22.1") - (mac-pass-control-to-system mac boolean "22.1") - (mac-allow-anti-aliasing mac boolean "22.1") - (mac-ts-script-language-on-focus mac - (choice (const :tag "System default behavior" nil) - (const :tag "Restore to script/language used in the last focus frame" t) - (cons :tag "Specify script/language" - (integer :tag "Script code") - (integer :tag "Language code"))) - "22.1") ;; This is not good news because it will use the wrong ;; version-specific directories when you upgrade. We need @@ -247,12 +212,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;;; (const :tag " current dir" nil) ;;; (directory :format "%v")))) ;; minibuf.c - (completion-auto-help minibuffer boolean) (enable-recursive-minibuffers minibuffer boolean) (history-length minibuffer - (choice (const :tag "Infinite" t) - integer)) - (history-delete-duplicates minibuffer boolean) + (choice (const :tag "Infinite" t) integer) + "22.1") + (history-delete-duplicates minibuffer boolean "22.1") + (read-buffer-completion-ignore-case minibuffer boolean "23.1") + (minibuffer-prompt-properties minibuffer (list @@ -307,72 +273,27 @@ since it could result in memory overflow and make Emacs crash." "22.1") ;; window.c (temp-buffer-show-function windows (choice (const nil) function)) - (display-buffer-function windows (choice (const nil) function)) - (pop-up-frames frames boolean) - (pop-up-frame-function frames function) - (special-display-buffer-names - frames - (repeat (choice :tag "Buffer" - :value "" - (string :format "%v") - (cons :tag "With attributes" - :format "%v" - :value ("" . nil) - (string :format "%v") - (repeat :tag "Attributes" - (cons :format "%v" - (symbol :tag "Parameter") - (sexp :tag "Value"))))))) - (special-display-regexps - frames - (repeat (choice :tag "Buffer" - :value "" - (regexp :format "%v") - (cons :tag "With attributes" - :format "%v" - :value ("" . nil) - (regexp :format "%v") - (repeat :tag "Attributes" - (cons :format "%v" - (symbol :tag "Parameter") - (sexp :tag "Value"))))))) - (special-display-function frames function) - (same-window-buffer-names windows (repeat (string :format "%v"))) - (same-window-regexps windows (repeat (regexp :format "%v"))) - (pop-up-windows windows boolean) - (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 windows (choice (const :tag "Off (nil)" :value nil) (const :tag "Full screen (t)" :value t) - (other :tag "Always" 1))) - (display-buffer-reuse-frames windows boolean "21.1") + (other :tag "Always" 1)) "22.1") ;; xdisp.c (scroll-step windows integer) (scroll-conservatively windows integer) (scroll-margin windows integer) (hscroll-margin windows integer "22.1") (hscroll-step windows number "22.1") - (truncate-partial-width-windows display boolean) + (truncate-partial-width-windows display boolean "23.1") (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 (const :tag "No limit" nil))) - (line-number-display-limit-width display integer) + (line-number-display-limit-width display integer "22.1") (highlight-nonselected-windows display boolean) (message-log-max debug (choice (const :tag "Disable" nil) (integer :menu-tag "lines" @@ -381,13 +302,14 @@ since it could result in memory overflow and make Emacs crash." (unibyte-display-via-language-environment mule boolean) (blink-cursor-alist cursor alist "22.1") (overline-margin display integer "22.1") + (underline-minimum-offset display integer "23.1") (mouse-autoselect-window display (choice (const :tag "Off (nil)" :value nil) (const :tag "Immediate" :value t) (number :tag "Delay by secs" :value 0.5)) "22.1") ;; xfaces.c - (scalable-fonts-allowed display boolean) + (scalable-fonts-allowed display boolean "22.1") ;; xfns.c (x-bitmap-file-path installation (repeat (directory :format "%v"))) @@ -432,8 +354,6 @@ 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)) - (featurep 'mac-carbon)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol)) @@ -462,10 +382,6 @@ since it could result in memory overflow and make Emacs crash." (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable) (custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start 'custom-variable) -(put 'selection-coding-system 'custom-set - (lambda (symbol value) - (set-selection-coding-system value) - (set symbol value))) ;; Record cus-start as loaded ;; if we have set up all the info that we can set up.