Mercurial > emacs
view lisp/w32-vars.el @ 111997:a5a188ddc758
Minor clean up to silence some gcc warnings.
* src/window.c (Fset_window_buffer):
* src/xterm.c (x_set_frame_alpha): Restructure code to silence
compiler warning.
(handle_one_xevent): Remove unused var `p'.
(do_ewmh_fullscreen): Remove unused var `lval'.
(xembed_set_info): Remove unused var `atom'.
* src/textprop.c (Fremove_list_of_text_properties): Add braces to silence
compiler warning.
* src/fontset.c (fontset_id_valid_p, dump_fontset):
* src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration.
* src/eval.c (Feval, Ffuncall): Avoid unneeded gotos.
* src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause'
label only when it's used.
* src/image.c (x_create_bitmap_from_xpm_data):
* src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like
its callers.
* src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and
`consumed_chars'.
(DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'.
(decode_coding_emacs_mule): Remove unused label `retry'.
(detect_eol): Add parens to silence compiler warning.
* src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where
it's used to silence the compiler.
(make_number): Modernize k&r declaration.
(mark_char_table): Add parens to silence compiler warning.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sun, 19 Dec 2010 00:43:42 -0500 |
parents | a3c68a313b81 |
children | 417b1e4d63cd |
line wrap: on
line source
;;; w32-vars.el --- MS-Windows specific user options ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Author: Jason Rumney <jasonr@gnu.org> ;; Keywords: internal ;; Package: emacs ;; This file is part of GNU Emacs. ;; 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 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 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: ;; Custom group for w32 specific settings (defgroup w32 nil "MS-Windows specific features." :group 'environment :version "22.1" :prefix "w32") ;; Redefine the font selection to use the standard W32 dialog (defcustom w32-use-w32-font-dialog t "Use the standard font dialog. If nil, pop up a menu of a fixed set of fonts including fontsets, like X does. See `w32-fixed-font-alist' for the font menu definition." :type 'boolean :group 'w32) (defvar w32-list-proportional-fonts nil "Include proportional fonts in the default font dialog.") (make-obsolete-variable 'w32-list-proportional-fonts "no longer used." "23.1") (defcustom w32-allow-system-shell nil "Disable startup warning when using \"system\" shells." :type 'boolean :group 'w32) (defcustom w32-system-shells '("cmd" "cmd.exe" "command" "command.com" "4nt" "4nt.exe" "4dos" "4dos.exe" "tcc" "tcc.exe" "ndos" "ndos.exe") "List of strings recognized as Windows system shells." :type '(repeat string) :group 'w32) ;; Want "menu" custom type for this. (defcustom w32-fixed-font-alist '("Font menu" ("Misc" ;; For these, we specify the pixel height and width. ("fixed" "Fixedsys") ("") ("Terminal 5x4" "-*-Terminal-normal-r-*-*-*-45-*-*-c-40-*-oem") ("Terminal 6x8" "-*-Terminal-normal-r-*-*-*-60-*-*-c-80-*-oem") ("Terminal 9x5" "-*-Terminal-normal-r-*-*-*-90-*-*-c-50-*-oem") ("Terminal 9x7" "-*-Terminal-normal-r-*-*-*-90-*-*-c-70-*-oem") ("Terminal 9x8" "-*-Terminal-normal-r-*-*-*-90-*-*-c-80-*-oem") ("Terminal 12x12" "-*-Terminal-normal-r-*-*-*-120-*-*-c-120-*-oem") ("Terminal 14x10" "-*-Terminal-normal-r-*-*-*-135-*-*-c-100-*-oem") ("Terminal 6x6 Bold" "-*-Terminal-bold-r-*-*-*-60-*-*-c-60-*-oem") ("") ("Lucida Sans Typewriter.8" "-*-Lucida Sans Typewriter-normal-r-*-*-11-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.9" "-*-Lucida Sans Typewriter-normal-r-*-*-12-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.10" "-*-Lucida Sans Typewriter-normal-r-*-*-13-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.11" "-*-Lucida Sans Typewriter-normal-r-*-*-15-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.12" "-*-Lucida Sans Typewriter-normal-r-*-*-16-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.8 Bold" "-*-Lucida Sans Typewriter-semibold-r-*-*-11-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.9 Bold" "-*-Lucida Sans Typewriter-semibold-r-*-*-12-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.10 Bold" "-*-Lucida Sans Typewriter-semibold-r-*-*-13-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.11 Bold" "-*-Lucida Sans Typewriter-semibold-r-*-*-15-*-*-*-c-*-iso8859-1") ("Lucida Sans Typewriter.12 Bold" "-*-Lucida Sans Typewriter-semibold-r-*-*-16-*-*-*-c-*-iso8859-1")) ("Courier" ("Courier 10x8" "-*-Courier-*normal-r-*-*-*-97-*-*-c-80-iso8859-1") ("Courier 12x9" "-*-Courier-*normal-r-*-*-*-120-*-*-c-90-iso8859-1") ("Courier 15x12" "-*-Courier-*normal-r-*-*-*-150-*-*-c-120-iso8859-1") ;; For these, we specify the point height. ("") ("8" "-*-Courier New-normal-r-*-*-11-*-*-*-c-*-iso8859-1") ("9" "-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-1") ("10" "-*-Courier New-normal-r-*-*-13-*-*-*-c-*-iso8859-1") ("11" "-*-Courier New-normal-r-*-*-15-*-*-*-c-*-iso8859-1") ("12" "-*-Courier New-normal-r-*-*-16-*-*-*-c-*-iso8859-1") ("8 bold" "-*-Courier New-bold-r-*-*-11-*-*-*-c-*-iso8859-1") ("9 bold" "-*-Courier New-bold-r-*-*-12-*-*-*-c-*-iso8859-1") ("10 bold" "-*-Courier New-bold-r-*-*-13-*-*-*-c-*-iso8859-1") ("11 bold" "-*-Courier New-bold-r-*-*-15-*-*-*-c-*-iso8859-1") ("12 bold" "-*-Courier New-bold-r-*-*-16-*-*-*-c-*-iso8859-1") ("8 italic" "-*-Courier New-normal-i-*-*-11-*-*-*-c-*-iso8859-1") ("9 italic" "-*-Courier New-normal-i-*-*-12-*-*-*-c-*-iso8859-1") ("10 italic" "-*-Courier New-normal-i-*-*-13-*-*-*-c-*-iso8859-1") ("11 italic" "-*-Courier New-normal-i-*-*-15-*-*-*-c-*-iso8859-1") ("12 italic" "-*-Courier New-normal-i-*-*-16-*-*-*-c-*-iso8859-1") ("8 bold italic" "-*-Courier New-bold-i-*-*-11-*-*-*-c-*-iso8859-1") ("9 bold italic" "-*-Courier New-bold-i-*-*-12-*-*-*-c-*-iso8859-1") ("10 bold italic" "-*-Courier New-bold-i-*-*-13-*-*-*-c-*-iso8859-1") ("11 bold italic" "-*-Courier New-bold-i-*-*-15-*-*-*-c-*-iso8859-1") ("12 bold italic" "-*-Courier New-bold-i-*-*-16-*-*-*-c-*-iso8859-1") )) "Fonts suitable for use in Emacs. Initially this is a list of some fixed width fonts that most people will have like Terminal and Courier. These fonts are used in the font menu if the variable `w32-use-w32-font-dialog' is nil." :type '(list (string :tag "Menu Title") (repeat :inline t (list :tag "Submenu" (string :tag "Title") (repeat :inline t (choice :tag "" (const :tag "Separator" ("")) (list :tag "Font Entry" (string :tag "Menu text") (string :tag "Font"))))))) :group 'w32) (provide 'w32-vars) ;;; w32-vars.el ends here