diff options
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 12 | ||||
| -rw-r--r-- | doc/lispref/frames.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/processes.texi | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/cus-start.el | 28 |
6 files changed, 48 insertions, 12 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index dd439721f4d..c3eadfc8558 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2012-05-02 Chong Yidong <cyd@gnu.org> + + * display.texi (Font Lookup): + * frames.texi (Pointer Shape): + * processes.texi (Subprocess Creation): Use defopt for options. + 2012-05-02 Glenn Morris <rgm@gnu.org> * elisp.texi (@copying): diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 4ec3b8bf08a..cafa8ddd18b 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2923,13 +2923,13 @@ The last three elements give additional information about the font. encoding of the font. @end defun -@defvar font-list-limit +@defopt font-list-limit This variable specifies maximum number of fonts to consider in font -matching. The function @code{x-family-fonts} will not return more than -that many fonts, and font selection will consider only that many fonts -when searching a matching font for face attributes. The default is -currently 100. -@end defvar +matching. The function @code{x-family-fonts} will not return more +than that many fonts, and font selection will consider only that many +fonts when searching a matching font for face attributes. The default +is 100. +@end defopt @node Fontsets @subsection Fontsets diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 869f03e2273..2ff4df55669 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1881,12 +1881,12 @@ of the buffer contents), the mouse pointer usually uses the @code{arrow} style, but you can specify a different style (one of those above) by setting @code{void-text-area-pointer}. -@defvar void-text-area-pointer +@defopt void-text-area-pointer This variable specifies the mouse pointer style for void text areas. These include the areas after the end of a line or below the last line in the buffer. The default is to use the @code{arrow} (non-text) pointer style. -@end defvar +@end defopt When using X, you can specify what the @code{text} pointer style really looks like by setting the variable @code{x-pointer-shape}. diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 71736584865..ea68cf9ce96 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -96,12 +96,12 @@ Expansion}). @code{nil} in this list refers to Executing a program can also try adding suffixes to the specified name: -@defvar exec-suffixes +@defopt exec-suffixes This variable is a list of suffixes (strings) to try adding to the specified program file name. The list should include @code{""} if you want the name to be tried exactly as specified. The default value is system-dependent. -@end defvar +@end defopt @strong{Please note:} The argument @var{program} contains only the name of the program; it may not contain any command-line arguments. You diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2aa0d9db207..d2ab4b60c8b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,6 +6,12 @@ 2012-05-02 Chong Yidong <cyd@gnu.org> + * cus-start.el (gc-cons-percentage, exec-suffixes) + (dos-display-scancodes, dos-hyper-key, dos-super-key) + (dos-keypad-mode, debug-on-signal, vertical-centering-font-regexp) + (make-cursor-line-fully-visible, void-text-area-pointer) + (font-list-limit): Add customization data. + * allout.el (allout-exposure-change-functions) (allout-structure-added-functions) (allout-structure-deleted-functions) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 9198eaddc37..3863e718f58 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -48,6 +48,7 @@ ;; :tag - custom-tag property (let ((all '(;; alloc.c (gc-cons-threshold alloc integer) + (gc-cons-percentage alloc float) (garbage-collection-messages alloc boolean) ;; buffer.c (mode-line-format mode-line sexp) ;Hard to do right. @@ -132,6 +133,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (exec-path execute (repeat (choice (const :tag "default directory" nil) (directory :format "%v")))) + (exec-suffixes execute (repeat string)) ;; charset.c (charset-map-path installation (repeat (directory :format "%v"))) @@ -174,6 +176,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (inverse-video display boolean) (visible-bell display boolean) (no-redraw-on-reenter display boolean) + + ;; dosfns.c + (dos-display-scancodes display boolean) + (dos-hyper-key keyboard integer) + (dos-super-key keyboard integer) + (dos-keypad-mode keyboard integer) + ;; editfns.c (user-full-name mail string) ;; eval.c @@ -190,8 +199,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (const :tag "always" t))) (debug-ignored-errors debug (repeat (choice symbol regexp))) (debug-on-quit debug boolean) - ;; fileio.c - (delete-by-moving-to-trash auto-save boolean "23.1") + (debug-on-signal debug boolean) + ;; fileio.c + (delete-by-moving-to-trash auto-save boolean "23.1") (auto-save-visited-file-name auto-save boolean) ;; filelock.c (temporary-file-directory @@ -227,6 +237,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (use-dialog-box menu boolean "21.1") (use-file-dialog menu boolean "22.1") (focus-follows-mouse frames boolean "20.3") + ;; fontset.c + (vertical-centering-font-regexp display regexp) ;; frame.c (default-frame-alist frames (repeat (cons :format "%v" @@ -419,6 +431,7 @@ since it could result in memory overflow and make Emacs crash." (hscroll-margin windows integer "22.1") (hscroll-step windows number "22.1") (truncate-partial-width-windows display boolean "23.1") + (make-cursor-line-fully-visible windows boolean) (mode-line-inverse-video mode-line boolean) (mode-line-in-non-selected-windows mode-line boolean "22.1") (line-number-display-limit display @@ -449,10 +462,21 @@ since it could result in memory overflow and make Emacs crash." (const :tag "System default" :value nil)) "23.3") (tool-bar-max-label-size frames integer "23.3") (auto-hscroll-mode scrolling boolean "21.1") + (void-text-area-pointer cursor + (choice + (const :tag "Standard (text pointer)" :value nil) + (const :tag "Arrow" :value arrow) + (const :tag "Text pointer" :value text) + (const :tag "Hand" :value hand) + (const :tag "Vertical dragger" :value vdrag) + (const :tag "Horizontal dragger" :value hdrag) + (const :tag "Same as mode line" :value modeline) + (const :tag "Hourglass" :value hourglass))) (display-hourglass cursor boolean) (hourglass-delay cursor number) ;; xfaces.c + (font-list-limit display integer) (scalable-fonts-allowed display boolean "22.1") ;; xfns.c (x-bitmap-file-path installation |