Now on revision 106536. ------------------------------------------------------------ revno: 106536 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-11-28 14:26:39 +0800 message: * emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-27 08:33:25 +0000 +++ lisp/ChangeLog 2011-11-28 06:26:39 +0000 @@ -1,3 +1,7 @@ +2011-11-28 Chong Yidong + + * emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc. + 2011-11-27 Nick Roberts * progmodes/gdb-mi.el (gdb-init-1): Condition execution of === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2011-10-27 03:01:40 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2011-11-28 06:26:39 +0000 @@ -233,10 +233,10 @@ (defun ,modefun (&optional arg ,@extra-args) ,(or doc (format (concat "Toggle %s on or off. -Interactively, with no prefix argument, toggle the mode. -With universal prefix ARG turn mode on. -With zero or negative ARG turn mode off. -\\{%s}") pretty-name keymap-sym)) +With a prefix argument ARG, enable %s if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. +\\{%s}") pretty-name pretty-name keymap-sym)) ;; Use `toggle' rather than (if ,mode 0 1) so that using ;; repeat-command still does the toggling correctly. (interactive (list (or current-prefix-arg 'toggle))) ------------------------------------------------------------ revno: 106535 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-11-28 14:24:48 +0800 message: More updates to Modes chapter of Emacs manual. * doc/emacs/modes.texi (Major Modes): Move major-mode variable doc here from Choosing Modes. Document describe-mode. Document prog-mode-hook and text-mode-hook. Add example of using hooks. (Minor Modes): Document behavior of mode command calls from Lisp. Note that setting the mode variable using Customize will DTRT. (Choosing Modes): Add example of setting a minor mode using a local variable. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2011-10-23 14:57:53 +0000 +++ admin/FOR-RELEASE 2011-11-28 06:24:48 +0000 @@ -170,7 +170,7 @@ files.texi cyd fixit.texi fortran-xtra.texi -frames.texi +frames.texi cyd glossary.texi help.texi cyd indent.texi @@ -182,6 +182,7 @@ mark.texi cyd mini.texi misc.texi +modes.texi cyd msdog.texi msdog-xtra.texi mule.texi @@ -197,7 +198,7 @@ trouble.texi vc-xtra.texi vc1-xtra.texi -windows.texi +windows.texi cyd xresources.texi ** Check the Lisp manual. === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-27 08:22:37 +0000 +++ doc/emacs/ChangeLog 2011-11-28 06:24:48 +0000 @@ -1,3 +1,13 @@ +2011-11-28 Chong Yidong + + * modes.texi (Major Modes): Move major-mode variable doc here from + Choosing Modes. Document describe-mode. Document prog-mode-hook + and text-mode-hook. Add example of using hooks. + (Minor Modes): Document behavior of mode command calls from Lisp. + Note that setting the mode variable using Customize will DTRT. + (Choosing Modes): Add example of setting a minor mode using a + local variable. + 2011-11-27 Chong Yidong * frames.texi (Creating Frames): Move frame parameter example to === modified file 'doc/emacs/modes.texi' --- doc/emacs/modes.texi 2011-11-16 17:47:25 +0000 +++ doc/emacs/modes.texi 2011-11-28 06:24:48 +0000 @@ -3,11 +3,11 @@ @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Modes, Indentation, International, Top -@chapter Editing Modes +@chapter Major and Minor Modes - Emacs contains many @dfn{editing modes}, each of which alters its -basic behavior in useful ways. These are divided into @dfn{major -modes} and @dfn{minor modes}. + Emacs contains many @dfn{editing modes} that alter its basic +behavior in useful ways. These are divided into @dfn{major modes} and +@dfn{minor modes}. Major modes provide specialized facilities for working on a particular file type, such as a C source file (@pxref{Programs}), or a @@ -38,15 +38,8 @@ Every buffer possesses a major mode, which determines the editing behavior of Emacs while that buffer is current. The mode line -normally shows the name of the current major mode, in parentheses. -@xref{Mode Line}. - - Usually, the major mode is automatically set by Emacs, when you -first visit a file or create a buffer. @xref{Choosing Modes}. You -can explicitly select a new major mode by using an @kbd{M-x} command. -Take the name of the mode and add @code{-mode} to get the name of the -command to select that mode. Thus, you can enter Lisp mode with -@kbd{M-x lisp-mode}. +normally shows the name of the current major mode, in parentheses +(@pxref{Mode Line}). The least specialized major mode is called @dfn{Fundamental mode}. This mode has no mode-specific redefinitions or variable settings, so @@ -55,73 +48,140 @@ For editing text of a specific type that Emacs knows about, such as Lisp code or English text, you typically use a more specialized major -mode, such as Lisp mode or Text mode. Such major modes change the -meanings of some keys to become more specifically adapted to the -language being edited. The ones that are commonly changed are -@key{TAB}, @key{DEL}, and @kbd{C-j}. The prefix key @kbd{C-c} -normally contains mode-specific commands. In addition, the commands -which handle comments use the mode to determine how comments are to be -delimited. Many major modes redefine the syntactical properties of -characters appearing in the buffer. - - The major modes fall into three major groups. The first group -contains modes for normal text, either plain or with mark-up. It -includes Text mode, HTML mode, SGML mode, @TeX{} mode and Outline -mode. The second group contains modes for specific programming -languages. These include Lisp mode (which has several variants), C -mode, Fortran mode, and others. The remaining major modes are not -intended for use on users' files; they are used in buffers created for -specific purposes by Emacs, such as Dired mode for buffers made by -Dired (@pxref{Dired}), Message mode for buffers made by @kbd{C-x m} -(@pxref{Sending Mail}), and Shell mode for buffers used for -communicating with an inferior shell process (@pxref{Interactive -Shell}). - - Most programming-language major modes specify that only blank lines -separate paragraphs. This is to make the paragraph commands useful. -(@xref{Paragraphs}.) They also cause Auto Fill mode to use the -definition of @key{TAB} to indent the new lines it creates. This is -because most lines in a program are usually indented -(@pxref{Indentation}). +mode, such as Lisp mode or Text mode. Most major modes fall into +three major groups. The first group contains modes for normal text, +either plain or with mark-up. It includes Text mode, HTML mode, SGML +mode, @TeX{} mode and Outline mode. The second group contains modes +for specific programming languages. These include Lisp mode (which +has several variants), C mode, Fortran mode, and others. The third +group consists of major modes that are not associated directly with +files; they are used in buffers created for specific purposes by +Emacs, such as Dired mode for buffers made by Dired (@pxref{Dired}), +Message mode for buffers made by @kbd{C-x m} (@pxref{Sending Mail}), +and Shell mode for buffers used to communicate with an inferior shell +process (@pxref{Interactive Shell}). + + Usually, the major mode is automatically set by Emacs, when you +first visit a file or create a buffer (@pxref{Choosing Modes}). You +can explicitly select a new major mode by using an @kbd{M-x} command. +Take the name of the mode and add @code{-mode} to get the name of the +command to select that mode. Thus, you can enter Lisp mode with +@kbd{M-x lisp-mode}. + +@vindex major-mode + The value of the buffer-local variable @code{major-mode} is a symbol +with the same name as the major mode command (e.g. @code{lisp-mode}). +This variable is set automatically; you should not change it yourself. + + The default value of @code{major-mode} determines the major mode to +use for files that do not specify a major mode, and for new buffers +created with @kbd{C-x b}. Normally, this default value is the symbol +@code{fundamental-mode}, which specifies Fundamental mode. You can +change this default value via the Customization interface (@pxref{Easy +Customization}), or by adding a line like this to your init file +(@pxref{Init File}): + +@smallexample +(setq-default major-mode 'text-mode) +@end smallexample + +@noindent +If the default value of @code{major-mode} is @code{nil}, the major +mode is taken from the previously current buffer. + + Specialized major modes often change the meanings of certain keys to +do something more suitable for the mode. For instance, programming +language modes bind @key{TAB} to indent the current line according to +the rules of the language (@pxref{Indentation}). The keys that are +commonly changed are @key{TAB}, @key{DEL}, and @kbd{C-j}. Many modes +also define special commands of their own, usually bound in the prefix +key @kbd{C-c}. Major modes can also alter user options and variables; +for instance, programming language modes typicaly set a buffer-local +value for the variable @code{comment-start}, which determines how +source code comments are delimited (@pxref{Comments}). + +@findex describe-mode +@kindex C-h m + To view the documentation for the current major mode, including a +list of its key bindings, type @code{C-h m} (@code{describe-mode}). + +@cindex mode hook +@vindex text-mode-hook +@vindex prog-mode-hook + Every major mode, apart from Fundamental mode, defines a @dfn{mode +hook}, a customizable list of Lisp functions to run each time the mode +is enabled in a buffer. @xref{Hooks}, for more information about +hooks. Each mode hook is named after its major mode, e.g. Fortran +mode has @code{fortran-mode-hook}. Furthermore, all text-based major +modes run @code{text-mode-hook}, and all programming language modes +run @code{prog-mode-hook}, prior to running their own mode hooks. + + Mode hooks are commonly used to enable minor modes (@pxref{Minor +Modes}). For example, you can put the following lines in your init +file to enable Flyspell minor mode in all text-based major modes +(@pxref{Spelling}), and Eldoc minor mode in Emacs Lisp mode +(@pxref{Lisp Doc}): + +@example +(add-hook 'text-mode-hook 'flyspell-mode) +(add-hook 'emacs-lisp-mode-hook 'eldoc-mode) +@end example @node Minor Modes @section Minor Modes @cindex minor modes @cindex mode, minor - A minor mode is an optional editing modes that alters the behavior -of Emacs in some well-defined way. Unlike major modes, any number of + A minor mode is an optional editing mode that alters the behavior of +Emacs in some well-defined way. Unlike major modes, any number of minor modes can be in effect at any time. Some minor modes are -@dfn{buffer-local}: they apply only to the current buffer, so you can -enable the mode in certain buffers and not others. Other minor modes -are @dfn{global}: while enabled, they affect everything you do in the -Emacs session, in all buffers. Some global minor modes are enabled by -default. - - Most minor modes say in the mode line when they are enabled, just -after the major mode indicator. For example, @samp{Fill} in the mode -line means that Auto Fill mode is enabled. @xref{Mode Line}. - - Each minor mode is associated with a command, called the @dfn{mode -command}, which turns it on or off. The name of this command consists -of the name of the minor mode, followed by @samp{-mode}; for instance, -the mode command for Auto Fill mode is @code{auto-fill-mode}. Calling -the minor mode command with no prefix argument @dfn{toggles} the mode, -turning it on if it was off, and off if it was on. A positive -argument always turns the mode on, and a zero or negative argument -always turns it off. Mode commands are usually invoked with -@kbd{M-x}, but you can bind keys to them if you wish (@pxref{Key -Bindings}). +@dfn{buffer-local}, and can be turned on (enabled) in certain buffers +and off (disabled) in others. Other minor modes are @dfn{global}: +while enabled, they affect everything you do in the Emacs session, in +all buffers. Most minor modes are disabled by default, but a few are +enabled by default. + + Most buffer-local minor modes say in the mode line when they are +enabled, just after the major mode indicator. For example, +@samp{Fill} in the mode line means that Auto Fill mode is enabled. +@xref{Mode Line}. + +@cindex mode commands for minor modes + Like major modes, each minor mode is associated with a @dfn{mode +command}, whose name consists of the mode name followed by +@samp{-mode}. For instance, the mode command for Auto Fill mode is +@code{auto-fill-mode}. But unlike a major mode command, which simply +enables the mode, the mode command for a minor mode can either enable +or disable it: + +@itemize +@item +If you invoke the mode command directly with no prefix argument +(either via @kbd{M-x}, or by binding it to a key and typing that key; +@pxref{Key Bindings}), that @dfn{toggles} the minor mode. The minor +mode is turned on if it was off, and turned off if it was on. + +@item +If you invoke the mode command with a prefix argument, the minor mode +is unconditionally turned off if that argument is zero or negative; +otherwise, it is unconditionally turned on. + +@item +If the mode command is called via Lisp, the minor mode is +unconditionally turned on if the argument is omitted or @code{nil}. +This makes it easy to turn on a minor mode from a major mode's mode +hook (@pxref{Major Modes}). A non-@code{nil} argument is handled like +an interactive prefix argument, as described above. +@end itemize Most minor modes also have a @dfn{mode variable}, with the same name as the mode command. Its value is non-@code{nil} if the mode is -enabled, and @code{nil} if it is disabled. In some minor modes---but -not all---the value of the variable alone determines whether the mode -is active: the mode command works simply by setting the variable, and -changing the value of the variable has the same effect as calling the -mode command. Because not all minor modes work this way, we recommend -that you avoid changing the mode variables directly; use the mode -commands instead. +enabled, and @code{nil} if it is disabled. In general, you should not +try to enable or disable the mode by changing the value of the mode +variable directly in Lisp; you should run the mode command instead. +However, setting the mode variable through the Customize interface +(@pxref{Easy Customization}) will always properly enable or disable +the mode, since Customize automatically runs the mode command for you. The following is a list of some buffer-local minor modes: @@ -189,11 +249,8 @@ wrapped at word boundaries. @xref{Visual Line Mode}. @end itemize - Here are some useful global minor modes. Since Line Number mode and -Transient Mark mode can be enabled or disabled just by setting the -value of the minor mode variable, you @emph{can} set them differently -for particular buffers, by explicitly making the corresponding -variable local in those buffers. @xref{Locals}. +@noindent +And here are some useful global minor modes: @itemize @bullet @item @@ -261,22 +318,27 @@ @noindent tells Emacs to use Lisp mode. Note how the semicolon is used to make -Lisp treat this line as a comment. Alternatively, you could write +Lisp treat this line as a comment. You could equivalently write @example ; -*- mode: Lisp;-*- @end example @noindent -The latter format allows you to specify local variables as well, like -this: +You can also use file-local variables to specify buffer-local minor +modes, by using @code{eval} specifications. For example, this first +nonblank line puts the buffer in Lisp mode and enables Auto-Fill mode: @example -; -*- mode: Lisp; tab-width: 4; -*- +; -*- mode: Lisp; eval: (auto-fill-mode 1); -*- @end example - If a file variable specifies a buffer-local minor mode, Emacs -enables that minor mode in the buffer. +@noindent +Note, however, that it is usually inappropriate to enable minor modes +this way, since most minor modes represent individual user +preferences. If you personally want to use a minor mode for a +particular file type, it is better to enable the minor mode via a +major mode hook (@pxref{Major Modes}). @vindex interpreter-mode-alist Second, if there is no file variable specifying a major mode, Emacs @@ -310,9 +372,9 @@ @noindent where @var{regexp} is a regular expression (@pxref{Regexps}), and -@var{mode-function} is a Lisp function that toggles a major mode. If -the text at the beginning of the file matches @var{regexp}, Emacs -chooses the major mode specified by @var{mode-function}. +@var{mode-function} is a major mode command. If the text at the +beginning of the file matches @var{regexp}, Emacs chooses the major +mode specified by @var{mode-function}. Alternatively, an element of @code{magic-mode-alist} may have the form @@ -323,7 +385,7 @@ @noindent where @var{match-function} is a Lisp function that is called at the beginning of the buffer; if the function returns non-@code{nil}, Emacs -set the major mode wit @var{mode-function}. +set the major mode with @var{mode-function}. Fourth---if Emacs still hasn't found a suitable major mode---it looks at the file's name. The correspondence between file names and @@ -370,29 +432,6 @@ @code{magic-fallback-mode-alist} contains forms that check for image files, HTML/XML/SGML files, and PostScript files. -@vindex major-mode - Once a major mode is chosen, Emacs sets the value of the variable -@code{major-mode} to the symbol for that major mode (e.g., -@code{text-mode} for Text mode). This is a per-buffer variable -(@pxref{Locals}); its buffer-local value is set automatically, and you -should not change it yourself. - - The default value of @code{major-mode} determines the major mode to -use for files that do not specify a major mode, and for new buffers -created with @kbd{C-x b}. Normally, this default value is the symbol -@code{fundamental-mode}, which specifies Fundamental mode. You can -change it via the Customization interface (@pxref{Easy -Customization}), or by adding a line like this to your init file -(@pxref{Init File}): - -@smallexample -(setq-default major-mode 'text-mode) -@end smallexample - -@noindent -If the default value of @code{major-mode} is @code{nil}, the major -mode is taken from the previously current buffer. - @findex normal-mode If you have changed the major mode of a buffer, you can return to the major mode Emacs would have chosen automatically, by typing ------------------------------------------------------------ revno: 106534 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Mon 2011-11-28 10:07:01 +0900 message: Truncate scroll runs that copy to where we copied to. * dispnew.c (scrolling_window): Truncate overlaps in copy destination of scroll runs so as to avoid assigning disabled bogus rows and unnecessary graphics copy operations. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-27 18:52:53 +0000 +++ src/ChangeLog 2011-11-28 01:07:01 +0000 @@ -1,3 +1,9 @@ +2011-11-28 YAMAMOTO Mitsuharu + + * dispnew.c (scrolling_window): Truncate overlaps in copy destination + of scroll runs so as to avoid assigning disabled bogus rows and + unnecessary graphics copy operations. + 2011-11-27 Eli Zaretskii * s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define. === modified file 'src/dispnew.c' --- src/dispnew.c 2011-11-26 13:11:03 +0000 +++ src/dispnew.c 2011-11-28 01:07:01 +0000 @@ -4554,18 +4554,69 @@ { rif->clear_window_mouse_face (w); rif->scroll_run_hook (w, r); - - /* Invalidate runs that copy from where we copied to. */ - for (j = i + 1; j < nruns; ++j) + } + + /* Truncate runs that copy to where we copied to, and + invalidate runs that copy from where we copied to. */ + for (j = nruns - 1; j > i; --j) + { + struct run *p = runs[j]; + int truncated_p = 0; + + if (p->nrows > 0 + && p->desired_y < r->desired_y + r->height + && p->desired_y + p->height > r->desired_y) { - struct run *p = runs[j]; - - if ((p->current_y >= r->desired_y + if (p->desired_y < r->desired_y) + { + p->nrows = r->desired_vpos - p->desired_vpos; + p->height = r->desired_y - p->desired_y; + truncated_p = 1; + } + else + { + int nrows_copied = (r->desired_vpos + r->nrows + - p->desired_vpos); + + if (p->nrows <= nrows_copied) + p->nrows = 0; + else + { + int height_copied = (r->desired_y + r->height + - p->desired_y); + + p->current_vpos += nrows_copied; + p->desired_vpos += nrows_copied; + p->nrows -= nrows_copied; + p->current_y += height_copied; + p->desired_y += height_copied; + p->height -= height_copied; + truncated_p = 1; + } + } + } + + if (r->current_y != r->desired_y + /* The condition below is equivalent to + ((p->current_y >= r->desired_y && p->current_y < r->desired_y + r->height) - || (p->current_y + p->height >= r->desired_y + || (p->current_y + p->height > r->desired_y && (p->current_y + p->height - < r->desired_y + r->height))) - p->nrows = 0; + <= r->desired_y + r->height))) + because we have 0 < p->height <= r->height. */ + && p->current_y < r->desired_y + r->height + && p->current_y + p->height > r->desired_y) + p->nrows = 0; + + /* Reorder runs by copied pixel lines if truncated. */ + if (truncated_p && p->nrows > 0) + { + int k = nruns - 1; + + while (runs[k]->nrows == 0 || runs[k]->height < p->height) + k--; + memmove (runs + j, runs + j + 1, (k - j) * sizeof (*runs)); + runs[k] = p; } } @@ -4580,7 +4631,14 @@ to_overlapped_p = to->overlapped_p; from->redraw_fringe_bitmaps_p = from->fringe_bitmap_periodic_p; assign_row (to, from); - to->enabled_p = 1, from->enabled_p = 0; + /* The above `assign_row' actually does swap, so if we had + an overlap in the copy destination of two runs, then + the second run would assign a previously disabled bogus + row. But thanks to the truncation code in the + preceding for-loop, we no longer have such an overlap, + and thus the assigned row should always be enabled. */ + xassert (to->enabled_p); + from->enabled_p = 0; to->overlapped_p = to_overlapped_p; } } ------------------------------------------------------------ revno: 106533 fixes bug(s): http://debbugs.gnu.org/9960 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2011-11-27 20:52:53 +0200 message: Fix MS-Windows build with MSVC compiler. Parts of the changes by Fabrice Popineau . lib-src/makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS). lib-src/emacsclient.c (main) : Remove declaration, already pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows. nt/inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs. (UINT64_MAX) [_WIN64]: Fix definition. (uintmax_t, intmax_t): Fix definitions. nt/inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide correct definitions. nt/config.nt (HAVE_DECL_STRTOLL): Define. (va_copy) [_WIN64]: Provide a better definition. src/s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define. (snprintf) [_MSC_VER]: Redirect to _snprintf. (strtoll) [_MSC_VER]: Redirect to _strtoi64. (malloc, free, realloc, calloc): Redirect to e_* only when compiling Emacs. src/lisp.h (GCTYPEBITS): Move before first use. (ALIGN_GCTYPEBITS) [_MSC_VER]: Define. (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in this macro definition. (tzname): Redirect to _tzname for all values of _MSC_VER. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-11-26 08:26:37 +0000 +++ lib-src/ChangeLog 2011-11-27 18:52:53 +0000 @@ -1,3 +1,10 @@ +2011-11-27 Eli Zaretskii + + * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS). + + * emacsclient.c (main) : Remove declaration, already + pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows. + 2011-11-24 Glenn Morris * make-docfile.c (scan_lisp_file): Treat defcustom like defvar. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2011-11-14 20:23:26 +0000 +++ lib-src/emacsclient.c 2011-11-27 18:52:53 +0000 @@ -1635,7 +1635,6 @@ /* Send over our environment and current directory. */ if (!current_frame) { - extern char **environ; int i; for (i = 0; environ[i]; i++) { === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2011-07-07 01:32:56 +0000 +++ lib-src/makefile.w32-in 2011-11-27 18:52:53 +0000 @@ -23,7 +23,7 @@ LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \ - -I../nt/inc -I../src + -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS) LIBS = $(BASE_LIBS) $(ADVAPI32) === modified file 'nt/ChangeLog' --- nt/ChangeLog 2011-11-26 08:26:37 +0000 +++ nt/ChangeLog 2011-11-27 18:52:53 +0000 @@ -1,3 +1,15 @@ +2011-11-27 Fabrice Popineau (tiny change) + + * inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs. + (UINT64_MAX) [_WIN64]: Fix definition. + (uintmax_t, intmax_t): Fix definitions. + + * inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide + correct definitions. + + * config.nt (HAVE_DECL_STRTOLL): Define. + (va_copy) [_WIN64]: Provide a better definition. + 2011-11-25 Juanma Barranquero * configure.bat: Fix typos. === modified file 'nt/config.nt' --- nt/config.nt 2011-11-05 17:16:01 +0000 +++ nt/config.nt 2011-11-27 18:52:53 +0000 @@ -303,6 +303,10 @@ /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R +/* Define to 1 if you have the declaration of `strtoll', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOLL 1 + /* Define to 1 if you have the declaration of `strtoull', and to 0 if you don't. */ #define HAVE_DECL_STRTOULL 1 @@ -353,8 +357,8 @@ /* A va_copy replacement for MSVC. */ #ifdef _MSC_VER # ifdef _WIN64 -# ifndef va_copy -# error "va_copy is needed, but not defined!" +# ifndef va_copy /* Need to be checked (?) */ +# define va_copy(d,s) ((d) = (s)) # endif # else /* not _WIN64 */ # define va_copy(d,s) ((d) = (s)) === modified file 'nt/inc/inttypes.h' --- nt/inc/inttypes.h 2011-05-06 12:09:08 +0000 +++ nt/inc/inttypes.h 2011-11-27 18:52:53 +0000 @@ -24,7 +24,13 @@ #include_next #else /* !__MINGW32__ */ #include "stdint.h" +#ifdef _WIN64 #define strtoumax _strtoui64 +#define strtoimax _strtoi64 +#else +#define strtoumax strtoul +#define strtoimax strtol +#endif #endif /* !__MINGW32__ */ #endif === modified file 'nt/inc/stdint.h' --- nt/inc/stdint.h 2011-11-13 14:43:13 +0000 +++ nt/inc/stdint.h 2011-11-27 18:52:53 +0000 @@ -29,7 +29,9 @@ #ifdef _WIN64 typedef __int64 intptr_t; -#define UINT64_MAX 18446744073709551615 +typedef unsigned int uint32_t; +typedef unsigned __int64 uint64_t; +#define UINT64_MAX (18446744073709551615i64) #define UINT64_MIN 0 /* "i64" is the non-standard suffix used by MSVC for 64-bit constants. */ #define INT64_MAX 9223372036854775807i64 @@ -39,6 +41,8 @@ #define UINTMAX_MIN UINT64_MIN #define INTMAX_MAX INT64_MAX #define INTMAX_MIN INT64_MIN +#define uintmax_t unsigned __int64 +#define intmax_t __int64 #else typedef int intptr_t; typedef unsigned int uint32_t; @@ -51,10 +55,10 @@ #define UINTMAX_MIN UINT32_MIN #define INTMAX_MAX INT32_MAX #define INTMAX_MIN INT32_MIN +#define uintmax_t unsigned long +#define intmax_t long #endif -#define uintmax_t unsigned __int64 -#define intmax_t __int64 #define PTRDIFF_MAX INTPTR_MAX #endif /* !__GNUC__ */ === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-27 18:33:17 +0000 +++ src/ChangeLog 2011-11-27 18:52:53 +0000 @@ -1,3 +1,19 @@ +2011-11-27 Eli Zaretskii + + * s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define. + (snprintf) [_MSC_VER]: Redirect to _snprintf. + (strtoll) [_MSC_VER]: Redirect to _strtoi64. + (malloc, free, realloc, calloc): Redirect to e_* only when + compiling Emacs. + + * lisp.h (GCTYPEBITS): Move before first use. + (ALIGN_GCTYPEBITS) [_MSC_VER]: Define. + (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in + this macro definition. + + * s/ms-w32.h (tzname): Redirect to _tzname for all values of + _MSC_VER. + 2011-11-27 Jan Djärv * gtkutil.c (xg_create_frame_widgets): Call === modified file 'src/lisp.h' --- src/lisp.h 2011-11-27 04:43:11 +0000 +++ src/lisp.h 2011-11-27 18:52:53 +0000 @@ -163,14 +163,23 @@ /* First, try and define DECL_ALIGN(type,var) which declares a static variable VAR of type TYPE with the added requirement that it be TYPEBITS-aligned. */ + +#ifndef GCTYPEBITS +#define GCTYPEBITS 3 +#endif + #ifndef NO_DECL_ALIGN # ifndef DECL_ALIGN # if HAVE_ATTRIBUTE_ALIGNED # define DECL_ALIGN(type, var) \ type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var # elif defined(_MSC_VER) +# define ALIGN_GCTYPEBITS 8 +# if (1 << GCTYPEBITS) != ALIGN_GCTYPEBITS +# error ALIGN_GCTYPEBITS is wrong! +# endif # define DECL_ALIGN(type, var) \ - type __declspec(align(1 << GCTYPEBITS)) var + type __declspec(align(ALIGN_GCTYPEBITS)) var # else /* What directives do other compilers use? */ # endif @@ -300,10 +309,6 @@ Lisp_Fwd_Kboard_Obj, /* Fwd to a Lisp_Object field of kboards. */ }; -#ifndef GCTYPEBITS -#define GCTYPEBITS 3 -#endif - /* These values are overridden by the m- file on some machines. */ #ifndef VALBITS #define VALBITS (BITS_PER_EMACS_INT - GCTYPEBITS) === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2011-11-05 16:30:13 +0000 +++ src/s/ms-w32.h 2011-11-27 18:52:53 +0000 @@ -267,6 +267,8 @@ #define getpid _getpid #ifdef _MSC_VER typedef int pid_t; +#define snprintf _snprintf +#define strtoll _strtoi64 #endif #define isatty _isatty #define logb _logb @@ -275,15 +277,17 @@ #define popen _popen #define pclose _pclose #define umask _umask +#ifndef _MSC_VER #define utimbuf _utimbuf +#endif #define strdup _strdup #define strupr _strupr #define strnicmp _strnicmp #define stricmp _stricmp #define tzset _tzset +#define tzname _tzname #if !defined (_MSC_VER) || (_MSC_VER < 1400) -#define tzname _tzname #undef utime #define utime _utime #endif @@ -335,7 +339,7 @@ #define _WINSOCK_H /* Defines size_t and alloca (). */ -#if (defined(_MSC_VER) && defined(emacs)) || defined(USE_CRT_DLL) +#ifdef emacs #define malloc e_malloc #define free e_free #define realloc e_realloc ------------------------------------------------------------ revno: 106532 committer: Jan D. branch nick: trunk timestamp: Sun 2011-11-27 19:33:17 +0100 message: Work around an Ubuntu 11.10 bug where Emacs loops forever when started. * configure.in: Check for gtk_window_set_has_resize_grip. * src/gtkutil.c (xg_create_frame_widgets): Call gtk_window_set_has_resize_grip (FALSE) if that function is present with Gtk+ 2.0. diff: === modified file 'ChangeLog' --- ChangeLog 2011-11-25 13:26:30 +0000 +++ ChangeLog 2011-11-27 18:33:17 +0000 @@ -1,3 +1,7 @@ +2011-11-27 Jan Djärv + + * configure.in: Check for gtk_window_set_has_resize_grip. + 2011-11-24 Juanma Barranquero * configure.in (HAVE_XPM): Fix typo. === modified file 'configure.in' --- configure.in 2011-11-24 01:58:14 +0000 +++ configure.in 2011-11-27 18:33:17 +0000 @@ -1990,8 +1990,8 @@ AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \ gtk_dialog_get_action_area gtk_widget_get_sensitive \ gtk_widget_get_mapped gtk_adjustment_get_page_size \ - gtk_orientable_set_orientation) - + gtk_orientable_set_orientation \ + gtk_window_set_has_resize_grip) fi dnl D-Bus has been tested under GNU/Linux only. Must be adapted for === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-26 21:40:41 +0000 +++ src/ChangeLog 2011-11-27 18:33:17 +0000 @@ -1,3 +1,9 @@ +2011-11-27 Jan Djärv + + * gtkutil.c (xg_create_frame_widgets): Call + gtk_window_set_has_resize_grip (FALSE) if that function is + present with Gtk+ 2.0. + 2011-11-26 Paul Eggert * fileio.c (Finsert_file_contents): Undo previous change; see === modified file 'src/gtkutil.c' --- src/gtkutil.c 2011-11-20 07:30:16 +0000 +++ src/gtkutil.c 2011-11-27 18:33:17 +0000 @@ -1100,6 +1100,14 @@ else wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL); + /* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu + has backported it to Gtk+ 2.0 and they add the resize grip for + Gtk+ 2.0 applications also. But it has a bug that makes Emacs loop + forever, so disable the grip. */ +#if GTK_MAJOR_VERSION < 3 && defined (HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP) + gtk_window_set_has_resize_grip (GTK_WINDOW (wtop), FALSE); +#endif + xg_set_screen (wtop, f); wvbox = gtk_vbox_new (FALSE, 0); ------------------------------------------------------------ revno: 106531 committer: Paul Eggert branch nick: trunk timestamp: Sun 2011-11-27 10:17:40 -0800 message: Spelling fixes (mostly "inactive" vs "deactivate"). diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-11-27 04:43:11 +0000 +++ doc/misc/gnus.texi 2011-11-27 18:17:40 +0000 @@ -21895,7 +21895,7 @@ automatically set for the original article. This is exactly what @emph{marks propagation} is about. -Marks propagation is deactivated by default. You can activate it for a +Marks propagation is inactive by default. You can activate it for a certain @code{nnmairix} group with @code{nnmairix-group-toggle-propmarks-this-group} (bound to @kbd{G b p}). This function will warn you if you try to use it with your default === modified file 'etc/NEWS.23' --- etc/NEWS.23 2011-11-27 04:43:11 +0000 +++ etc/NEWS.23 2011-11-27 18:17:40 +0000 @@ -1027,8 +1027,8 @@ region, similar to mouse-selection. *** Temporarily active regions, created using shift-selection or -mouse-selection, are not necessarily deactivated in the next command. -They are only deactivated after point motion commands that are not +mouse-selection, are not necessarily deactivated after the next command. +They are deactivated only after point motion commands that are not shift-translated, or after commands that would ordinarily deactivate the mark in Transient Mark mode (e.g., any command that modifies the buffer). === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2011-11-25 13:26:30 +0000 +++ lisp/ChangeLog.15 2011-11-27 18:17:40 +0000 @@ -2809,7 +2809,7 @@ Consolidate layout provisions coce directly into the activation condition branch, now that we've removed those provisions. (allout-unload-function): Explicitly activate the mode before - deactivating, if it's initially deactivated. + deactivating, if it's initially inactive. (allout-set-buffer-multibyte): Properly prevent byte-compiler warnings for version of function used only where set-buffer-multibyte is unavailable. === modified file 'lisp/ChangeLog.4' --- lisp/ChangeLog.4 2011-11-20 02:29:42 +0000 +++ lisp/ChangeLog.4 2011-11-27 18:17:40 +0000 @@ -914,7 +914,7 @@ (desktop-locals-to-save): Add line-number-mode to be saved when local. (desktop-remove): In case the desktop file cannot be deleted - make sure that the desktop system is still inactivated. + make sure that the desktop system is still inactive. (desktop-kill): In case an error occurs when saving the desktop, offer to quit regardless. (desktop-save-buffer-p): Disregard case when testing file and === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2011-11-27 04:43:11 +0000 +++ lisp/ChangeLog.7 2011-11-27 18:17:40 +0000 @@ -18065,7 +18065,7 @@ have KEY. (current-input-method-title): Doc-string modified. (select-input-method): Set current-input-method to nil even if - inactivation of the current input method failed. + deactivation of the current input method failed. (set-language-environment): Doc-string modified. (describe-language-support): Doc-string modified. Calls an appropriate function for each language. === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2011-10-01 20:32:01 +0000 +++ lisp/cus-edit.el 2011-11-27 18:17:40 +0000 @@ -3225,7 +3225,7 @@ (if (not inactive) ;; Widget is alive, we don't have to do anything special (widget-default-delete widget) - ;; WIDGET is already deleted because we did so to inactivate it; + ;; WIDGET is already deleted because we did so to deactivate it; ;; now just get rid of the label we put in its place. (delete-region (car (cdr inactive)) (+ (car (cdr inactive)) (cdr (cdr inactive)))) === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2011-11-19 09:18:31 +0000 +++ lisp/emacs-lisp/advice.el 2011-11-27 18:17:40 +0000 @@ -625,12 +625,12 @@ ;; ;; (ad-activate-regexp "^ange-ftp-") ;; -;; A saver way would have been to use +;; A safer way would have been to use ;; ;; (ad-update-regexp "^ange-ftp-") ;; ;; instead which would have only reactivated currently actively advised -;; functions, but not functions that were currently deactivated. All these +;; functions, but not functions that were currently inactive. All these ;; functions can also be called interactively. ;; A certain piece of advice is considered a match if its name contains a @@ -833,7 +833,7 @@ ;; Reactivate an advised function but only if its advice is currently ;; active. This can be used to bring all currently advised function up ;; to date with the current state of advice without also activating -;; currently deactivated functions. +;; currently inactive functions. ;; - Caching: ;; Is the saving of an advised definition and an identifying cache-id so ;; it can be reused, for example, for activation after deactivation. @@ -853,7 +853,7 @@ ;; - ad-activate to activate the advice of a FUNCTION ;; - ad-deactivate to deactivate the advice of a FUNCTION ;; - ad-update to activate the advice of a FUNCTION unless it was not -;; yet activated or is currently deactivated. +;; yet activated or is currently inactive. ;; - ad-unadvise deactivates a FUNCTION and removes all of its advice ;; information, hence, it cannot be activated again ;; - ad-recover tries to redefine a FUNCTION to its original definition and @@ -1261,7 +1261,7 @@ ;; contain some advice matched by the regular expression. This is a save ;; way to update the activation of advised functions whose advice changed ;; in some way or other without accidentally also activating currently -;; deactivated functions: +;; inactive functions: ;; ;; (ad-update-regexp "^fg-") ;; nil === modified file 'lisp/erc/ChangeLog.02' --- lisp/erc/ChangeLog.02 2011-11-20 02:29:42 +0000 +++ lisp/erc/ChangeLog.02 2011-11-27 18:17:40 +0000 @@ -979,7 +979,7 @@ 2002-11-16 Alex Schroeder - * erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, + * erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20: Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries. @@ -1447,7 +1447,7 @@ * erc-match.el 1.10: fixed spelling error * erc-track.el 1.14, erc-match.el 1.9: * erc-match.el: - highlight current nickname in its own face (deactivated by default): + highlight current nickname in its own face (inactive by default): - added erc-current-nick-highlight-type, erc-current-nick-face, erc-current-nick-p @@ -1564,7 +1564,7 @@ (require 'erc-nickserv) is now necessary for this to work * erc.el 1.281: - * results of /COUNTRY now formatted as notice; errors are ignored, + * results of /COUNTRY now formatted as notice; errors are ignored, fixing bug which made prompt disappear @@ -1959,9 +1959,9 @@ * erc.el 1.245: remove trailing \n from any sent text - * servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, - erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, - erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, + * servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, + erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, + erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244: clean whitespace === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-27 04:43:11 +0000 +++ lisp/gnus/ChangeLog 2011-11-27 18:17:40 +0000 @@ -2778,7 +2778,7 @@ 2011-01-28 Lars Ingebrigtsen * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active - data if the group is deactivated. + data if the group is inactive. 2011-01-28 Julien Danjou === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-11-25 07:14:48 +0000 +++ lisp/gnus/gnus-group.el 2011-11-27 18:17:40 +0000 @@ -1354,7 +1354,7 @@ (predicate t) ; We list all groups? (t (or - (if (eq unread t) ; Deactivated? + (if (eq unread t) ; Inactive? gnus-group-list-inactive-groups ; We list inactive (and (numberp unread) (> unread 0))) === modified file 'lisp/isearch.el' --- lisp/isearch.el 2011-11-19 21:03:12 +0000 +++ lisp/isearch.el 2011-11-27 18:17:40 +0000 @@ -1872,7 +1872,7 @@ (goto-char isearch-point)) (defun isearch-reread-key-sequence-naturally (keylist) - "Reread key sequence KEYLIST with Isearch mode's keymap deactivated. + "Reread key sequence KEYLIST with an inactive Isearch-mode keymap. Return the key sequence as a string/vector." (isearch-unread-key-sequence keylist) (let (overriding-terminal-local-map) === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-11-27 04:43:11 +0000 +++ lisp/ldefs-boot.el 2011-11-27 18:17:40 +0000 @@ -27771,7 +27771,7 @@ (autoload 'table-release "table" "\ Convert a table into plain text by removing the frame from a table. -Remove the frame from a table and inactivate the table. This command +Remove the frame from a table and deactivate the table. This command converts a table into plain text without frames. It is a companion to `table-capture' which does the opposite process. === modified file 'lisp/mh-e/mh-tool-bar.el' --- lisp/mh-e/mh-tool-bar.el 2011-01-26 08:36:39 +0000 +++ lisp/mh-e/mh-tool-bar.el 2011-11-27 18:17:40 +0000 @@ -127,7 +127,7 @@ first line is useful and complete without the rest of the string. Optional item ENABLE-EXPR is an arbitrary lisp expression. If it - evaluates to nil, then the button is deactivated, otherwise it is + evaluates to nil, then the button is inactive, otherwise it is active. If it isn't present then the button is always active." ;; The following variable names have been carefully chosen to make code ;; generation easier. Modifying the names should be done carefully. === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-11-17 09:09:20 +0000 +++ lisp/net/tramp.el 2011-11-27 18:17:40 +0000 @@ -1331,7 +1331,7 @@ (setq fn nil))) (setq btn (1+ btn)))) ;; The following code inserts filename and line number. - ;; Should be deactivated by default, because it is time + ;; Should be inactive by default, because it is time ;; consuming. ; (let ((ffn (find-function-noselect (intern fn)))) ; (insert === modified file 'lisp/textmodes/table.el' --- lisp/textmodes/table.el 2011-11-20 02:29:42 +0000 +++ lisp/textmodes/table.el 2011-11-27 18:17:40 +0000 @@ -173,19 +173,19 @@ ;; +-------------------------------+----------------------------------+ ;; |`table-recognize' |Recognize all tables in the | ;; |`table-unrecognize' |current buffer and | -;; | |activate/inactivate them. | +;; | |activate/deactivate them. | ;; +-------------------------------+----------------------------------+ ;; |`table-recognize-region' |Recognize all the cells in a | -;; |`table-unrecognize-region' |region and activate/inactivate | +;; |`table-unrecognize-region' |region and activate/deactivate | ;; | |them. | ;; +-------------------------------+----------------------------------+ ;; |`table-recognize-table' |Recognize all the cells in a | ;; |`table-unrecognize-table' |single table and | -;; | |activate/inactivate them. | +;; | |activate/deactivate them. | ;; +-------------------------------+----------------------------------+ ;; |`table-recognize-cell' |Recognize a cell. Find a cell | ;; |`table-unrecognize-cell' |which contains the current point | -;; | |and activate/inactivate that cell.| +;; | |and activate/deactivate that cell.| ;; +-------------------------------+----------------------------------+ ;; |`table-forward-cell' |Move point to the next Nth cell in| ;; | |a table. | @@ -3856,7 +3856,7 @@ ;;;###autoload (defun table-release () "Convert a table into plain text by removing the frame from a table. -Remove the frame from a table and inactivate the table. This command +Remove the frame from a table and deactivate the table. This command converts a table into plain text without frames. It is a companion to `table-capture' which does the opposite process." (interactive) === modified file 'src/ChangeLog.10' --- src/ChangeLog.10 2011-11-27 04:43:11 +0000 +++ src/ChangeLog.10 2011-11-27 18:17:40 +0000 @@ -12087,7 +12087,7 @@ (merge_face_heights): Eliminate GCPRO arg. All callers changed. * keyboard.c (command_loop_1): Change Vtransient_mark_mode - before deciding whether to inactivate mark. + before deciding whether to deactivate mark. 2004-11-06 Lars Brinkhoff === modified file 'src/search.c' --- src/search.c 2011-11-20 03:48:53 +0000 +++ src/search.c 2011-11-27 18:17:40 +0000 @@ -3132,7 +3132,7 @@ Fmatch_data (Qnil, Qnil, Qnil)); } -/* Quote a string to inactivate reg-expr chars */ +/* Quote a string to deactivate reg-expr chars */ DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0, doc: /* Return a regexp string which matches exactly STRING and nothing else. */) ------------------------------------------------------------ revno: 106530 committer: Nick Roberts branch nick: trunk timestamp: Sun 2011-11-27 21:33:25 +1300 message: progmodes/gdb-mi.el (gdb-init-1): Condition execution of gdb-get-source-file-list on gdb-create-source-file-list. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-27 04:43:11 +0000 +++ lisp/ChangeLog 2011-11-27 08:33:25 +0000 @@ -1,3 +1,8 @@ +2011-11-27 Nick Roberts + + * progmodes/gdb-mi.el (gdb-init-1): Condition execution of + gdb-get-source-file-list on gdb-create-source-file-list. + 2011-11-26 Eli Zaretskii * whitespace.el (whitespace-newline): Use a different foreground === modified file 'lisp/progmodes/gdb-mi.el' --- lisp/progmodes/gdb-mi.el 2011-11-20 19:35:27 +0000 +++ lisp/progmodes/gdb-mi.el 2011-11-27 08:33:25 +0000 @@ -873,13 +873,13 @@ (gdb-input (list "-gdb-set non-stop 1" 'gdb-non-stop-handler))) ;; find source file and compilation directory here - (gdb-input + (if gdb-create-source-file-list + (gdb-input ; Needs GDB 6.2 onwards. - (list "-file-list-exec-source-files" 'gdb-get-source-file-list)) - (if gdb-create-source-file-list - (gdb-input + (list "-file-list-exec-source-files" 'gdb-get-source-file-list))) + (gdb-input ; Needs GDB 6.0 onwards. - (list "-file-list-exec-source-file" 'gdb-get-source-file))) + (list "-file-list-exec-source-file" 'gdb-get-source-file)) (gdb-input (list "-gdb-show prompt" 'gdb-get-prompt))) ------------------------------------------------------------ revno: 106529 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-11-27 16:22:37 +0800 message: More updates for the Frames chapter in Emacs manual. * doc/emacs/frames.texi (Creating Frames): Move frame parameter example to Frame Parameters node. (Frame Commands): C-x 5 o does not warp the mouse by default. (Fonts): Add more GTK-style properties; also, they should be capitalized. (Special Buffer Frames): Node deleted; special-display is on the way out. (Frame Parameters): Example moved here from Creating Frames. Clarify that default-frame-alist affects the initial frame too. Delete auto-raise-mode and auto-lower-mode. (Wheeled Mice): Node deleted. Content moved to Mouse Commands. (Dialog Boxes): Delete x-gtk-use-old-file-dialog. * doc/emacs/windows.texi (Window Choice): Add xref to Lisp manual for special-display-*. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-26 13:51:58 +0000 +++ doc/emacs/ChangeLog 2011-11-27 08:22:37 +0000 @@ -1,3 +1,21 @@ +2011-11-27 Chong Yidong + + * frames.texi (Creating Frames): Move frame parameter example to + Frame Parameters node. + (Frame Commands): C-x 5 o does not warp the mouse by default. + (Fonts): Add more GTK-style properties; also, they should be + capitalized. + (Special Buffer Frames): Node deleted; special-display is on the + way out. + (Frame Parameters): Example moved here from Creating Frames. + Clarify that default-frame-alist affects the initial frame too. + Delete auto-raise-mode and auto-lower-mode. + (Wheeled Mice): Node deleted. Content moved to Mouse Commands. + (Dialog Boxes): Delete x-gtk-use-old-file-dialog. + + * windows.texi (Window Choice): Add xref to Lisp manual for + special-display-*. + 2011-11-26 Eli Zaretskii * display.texi (Text Display): Update the description, === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-11-26 13:51:58 +0000 +++ doc/emacs/display.texi 2011-11-27 08:22:37 +0000 @@ -122,7 +122,7 @@ non-@code{nil} value, Emacs adjusts point this way even if the scroll command leaves point in the window. This variable affects all the scroll commands documented in this section, as well as scrolling with -the mouse wheel (@pxref{Wheeled Mice}); in general, it affects any +the mouse wheel (@pxref{Mouse Commands}); in general, it affects any command that has a non-@code{nil} @code{scroll-command} property. @xref{Property Lists,,, elisp, The Emacs Lisp Reference Manual}. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-10-26 14:07:31 +0000 +++ doc/emacs/emacs.texi 2011-11-27 08:22:37 +0000 @@ -505,10 +505,8 @@ * Fonts:: Changing the frame font. * Speedbar:: How to make and use a speedbar frame. * Multiple Displays:: How one Emacs job can talk to several displays. -* Special Buffer Frames:: You can make certain buffers have their own frames. * Frame Parameters:: Changing the colors and other modes of frames. * Scroll Bars:: How to enable and disable scroll bars; how to use them. -* Wheeled Mice:: Using mouse wheels for scrolling. * Drag and Drop:: Using drag and drop to open files and insert text. * Menu Bars:: Enabling and disabling the menu bar. * Tool Bars:: Enabling and disabling the tool bar. === modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2011-11-25 15:43:34 +0000 +++ doc/emacs/frames.texi 2011-11-27 08:22:37 +0000 @@ -8,7 +8,7 @@ When Emacs is started on a graphical display, e.g. on the X Window System, it occupies a graphical system-level ``window''. In this -manual, we call this a @dfn{frame}; we reserve the word ``window'' for +manual, we call this a @dfn{frame}, reserving the word ``window'' for the part of the frame used for displaying a buffer. A frame initially contains one window, but it can be subdivided into multiple windows (@pxref{Windows}). A frame normally also contains a menu bar, tool @@ -53,10 +53,8 @@ * Fonts:: Changing the frame font. * Speedbar:: How to make and use a speedbar frame. * Multiple Displays:: How one Emacs job can talk to several displays. -* Special Buffer Frames:: You can make certain buffers have their own frames. * Frame Parameters:: Changing the colors and other modes of frames. * Scroll Bars:: How to enable and disable scroll bars; how to use them. -* Wheeled Mice:: Using mouse wheels for scrolling. * Drag and Drop:: Using drag and drop to open files and insert text. * Menu Bars:: Enabling and disabling the menu bar. * Tool Bars:: Enabling and disabling the tool bar. @@ -95,7 +93,7 @@ @findex mouse-set-point The most basic mouse command is @code{mouse-set-point}, which is -called by clicking with the left mouse button, @kbd{Mouse-1}, in the +invoked by clicking with the left mouse button, @kbd{Mouse-1}, in the text area of a window. This moves point to the position where you clicked. If that window was not the selected window, it becomes the selected window. @@ -190,6 +188,22 @@ unshifted cursor motion command, in addition to the usual ways of deactivating the mark. @xref{Shift Selection}. +@cindex mouse wheel +@findex mouse-wheel-mode +@cindex Mouse Wheel minor mode +@cindex mode, Mouse Wheel +@vindex mouse-wheel-follow-mouse +@vindex mouse-wheel-scroll-amount +@vindex mouse-wheel-progressive-speed + Some mice have a ``wheel'' which can be used for scrolling. Emacs +supports scrolling windows with the mouse wheel, by default, on most +graphical displays. To toggle this feature, use @kbd{M-x +mouse-wheel-mode}. The variables @code{mouse-wheel-follow-mouse} and +@code{mouse-wheel-scroll-amount} determine where and by how much +buffers are scrolled. The variable +@code{mouse-wheel-progressive-speed} determines whether the scroll +speed is linked to how fast you move the wheel. + @node Word and Line Mouse @section Mouse Commands for Words and Lines @@ -366,13 +380,13 @@ @cindex creating frames @kindex C-x 5 - The prefix key @kbd{C-x 5} is analogous to @kbd{C-x 4}, with -parallel subcommands. The difference is that @kbd{C-x 5} commands -create a new frame rather than just a new window in the selected frame -(@pxref{Pop Up Window}). If an existing visible or iconified -(``minimized'') frame already displays the requested material, these -commands use the existing frame, after raising or deiconifying -(``un-minimizing'') as necessary. + The prefix key @kbd{C-x 5} is analogous to @kbd{C-x 4}. Whereas +each @kbd{C-x 4} command pops up a buffer in a different window in the +selected frame (@pxref{Pop Up Window}), the @kbd{C-x 5} commands use a +different frame. If an existing visible or iconified (``minimized'') +frame already displays the requested buffer, that frame is raised and +deiconified (``un-minimized''); otherwise, a new frame is created on +the current display terminal. The various @kbd{C-x 5} commands differ in how they find or create the buffer to select: @@ -407,56 +421,32 @@ @xref{Visiting}. @end table -@cindex default-frame-alist -@cindex initial-frame-alist -@cindex face customization, in init file -@cindex color customization, in init file - You can control the appearance of new frames you create by setting the -frame parameters in @code{default-frame-alist}. You can use the -variable @code{initial-frame-alist} to specify parameters that affect -only the initial frame. @xref{Initial Parameters,,, elisp, The Emacs -Lisp Reference Manual}, for more information. - -@cindex font (default) - Here is an example of using @code{default-frame-alist} to specify -the default foreground color and font: - -@example -(add-to-list 'default-frame-alist '(font . "10x20")) -(add-to-list 'default-frame-alist - '(foreground-color . "blue")) -@end example - -@noindent -By putting such customizations in your init file, you can control the -appearance of all the frames Emacs creates, including the initial one -(@pxref{Init File}). @xref{Fonts}, for other ways to set the default -font. + You can control the appearance and behavior of the newly-created +frames by specifying @dfn{frame parameters}. @xref{Frame Parameters}. @node Frame Commands @section Frame Commands - The following commands let you create, delete and operate on frames: + The following commands are used to delete and operate on frames: @table @kbd +@item C-x 5 0 +@kindex C-x 5 0 +@findex delete-frame +Delete the selected frame (@code{delete-frame}). This signals an +error if there is only one frame. + @item C-z @kindex C-z @r{(X windows)} @findex suspend-frame Minimize (or ``iconify) the selected Emacs frame (@code{suspend-frame}). @xref{Exiting}. -@item C-x 5 0 -@kindex C-x 5 0 -@findex delete-frame -Delete the selected frame (@code{delete-frame}). This is not allowed -if there is only one frame. - @item C-x 5 o @kindex C-x 5 o @findex other-frame -Select another frame, raise it, and warp the mouse to it. If you -repeat this command, it cycles through all the frames on your -terminal. +Select another frame, and raise it. If you repeat this command, it +cycles through all the frames on your terminal. @item C-x 5 1 @kindex C-x 5 1 @@ -464,43 +454,37 @@ Delete all frames on the current terminal, except the selected one. @end table - The @kbd{C-x 5 0} (@code{delete-frame}) command never deletes the -last frame. This prevents you from losing the ability to interact -with the Emacs process. Note that when Emacs is run as a daemon -(@pxref{Emacs Server}), there is always a ``virtual frame'' that -remains after all the ordinary, interactive frames are deleted. In -this case, @kbd{C-x 5 0} can delete the last interactive frame; you -can use @command{emacsclient} to reconnect to the Emacs session. + The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected +frame. However, it will refuse to delete the last frame in an Emacs +session, to prevent you from losing the ability to interact with the +Emacs session. Note that when Emacs is run as a daemon (@pxref{Emacs +Server}), there is always a ``virtual frame'' that remains after all +the ordinary, interactive frames are deleted. In this case, @kbd{C-x +5 0} can delete the last interactive frame; you can use +@command{emacsclient} to reconnect to the Emacs session. - The @kbd{C-x 5 1} (@code{delete-other-frames}) command only deletes -frames on the current terminal. For example, if you call it from an X -frame, it deletes the other frames on that X display; if the Emacs -process has frames open on other X displays or text terminals, those -are not deleted. + The @kbd{C-x 5 1} (@code{delete-other-frames}) command deletes all +other frames on the current terminal (this terminal refers to either a +graphical display, or a text-only terminal; @pxref{Non-Window +Terminals}). If the Emacs session has frames open on other graphical +displays or text terminals, those are not deleted. @vindex focus-follows-mouse - On X, you may have to tell Emacs how the window manager handles -focus-switching between windows, in order for @kbd{C-x 5 o} -(@code{other-frame}) to work properly. Unfortunately, there is no way -for Emacs to detect this automatically, so you should set the variable -@code{focus-follows-mouse}. The default is @code{nil}, meaning you -have to click on the window to select it (the default for most modern -window managers). You should change it to @code{t} if your window -manager selects a window and gives it focus anytime you move the mouse -onto the window. - - The window manager that is part of MS-Windows always gives focus to -a frame that raises, so this variable has no effect in the native -MS-Windows build of Emacs. However, you may still wish to set this -variable to @code{t} to have Emacs automatically move the mouse -pointer to the raised frame. + The @kbd{C-x 5 o} (@code{other-frame}) command selects the next +frame on the current terminal. If you are using Emacs on the X Window +System with a window manager that selects (or @dfn{gives focus to}) +whatever frame the mouse cursor is over, you have to change the +variable @code{focus-follows-mouse} to @code{t} in order for this +command to work properly. Then invoking @kbd{C-x 5 o} will also warp +the mouse cursor to the chosen frame. @node Fonts @section Fonts @cindex fonts - By default, Emacs displays text in X using a 12-point monospace -font. There are several different ways to specify a different font: + By default, Emacs displays text on graphical displays using a +12-point monospace font. There are several different ways to specify +a different font: @itemize @item @@ -514,7 +498,7 @@ parameter (@pxref{Creating Frames}), like this: @smallexample -(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-12")) +(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10")) @end smallexample @cindex X defaults file @@ -536,18 +520,16 @@ If you are running Emacs on the GNOME desktop, you can tell Emacs to use the default system font by setting the variable @code{font-use-system-font} to @code{t} (the default is @code{nil}). -For this to work, Emacs must be compiled with Gconf support; this is -done automatically if the libraries are present at compile time. +For this to work, Emacs must have been compiled with Gconf support. @item Use the command line option @samp{-fn} (or @samp{--font}). @xref{Font X}. @end itemize -To check what font you're currently using, the @kbd{C-u C-x =} -command can be helpful. It'll describe the character under point, and -also say what font it's rendered in, if the window system you're -running under supports that. + To check what font you're currently using, the @kbd{C-u C-x =} +command can be helpful. It describes the character at point, and +names the font that it's rendered in. @cindex fontconfig On X, there are four different ways to express a ``font name''. The @@ -561,7 +543,7 @@ @noindent Within this format, any of the elements in braces may be omitted. Here, @var{fontname} is the @dfn{family name} of the font, such as -@samp{Monospace} or @samp{DejaVu Serif}; @var{fontsize} is the +@samp{Monospace} or @samp{DejaVu Sans Mono}; @var{fontsize} is the @dfn{point size} of the font (one @dfn{printer's point} is about 1/72 of an inch); and the @samp{@var{name}=@var{values}} entries specify settings such as the slant and weight of the font. Each @var{values} @@ -574,7 +556,7 @@ @table @samp @item slant -One of @samp{italic}, @samp{oblique} or @samp{roman}. +One of @samp{italic}, @samp{oblique}, or @samp{roman}. @item weight One of @samp{light}, @samp{medium}, @samp{demibold}, @samp{bold} or @@ -608,8 +590,9 @@ Fontconfig manual, which is distributed with Fontconfig and available online at @url{http://fontconfig.org/fontconfig-user.html}. - The second way to specify a font is to use a @dfn{GTK font -description}. These have the syntax +@cindex GTK font pattern + The second way to specify a font is to use a @dfn{GTK font pattern}. +These have the syntax @smallexample @var{fontname} [@var{properties}] [@var{fontsize}] @@ -618,20 +601,24 @@ @noindent where @var{fontname} is the family name, @var{properties} is a list of property values separated by spaces, and @var{fontsize} is the point -size. The properties that you may specify are as follows: +size. The properties that you may specify for GTK font patterns are +as follows: -@table @samp -@item style -One of @samp{roman}, @samp{italic} or @samp{oblique}. If omitted, the -@samp{roman} style is used. -@item weight -One of @samp{medium}, @samp{ultra-light}, @samp{light}, -@samp{semi-bold}, or @samp{bold}. If omitted, @samp{medium} weight is -used. -@end table +@itemize +@item +Slant properties: @samp{Italic} or @samp{Oblique}. If omitted, the +default (roman) slant is implied. +@item +Weight properties: @samp{Bold}, @samp{Book}, @samp{Light}, +@samp{Medium}, @samp{Semi-bold}, or @samp{Ultra-light}. If omitted, +@samp{Medium} weight is implied. +@item +Width properties: @samp{Semi-Condensed} or @samp{Condensed}. If +omitted, a default width is used. +@end itemize @noindent -Here are some examples of GTK font descriptions: +Here are some examples of GTK font patterns: @smallexample Monospace 12 @@ -683,8 +670,8 @@ @samp{extended}, or @samp{semicondensed} (some font names support other values). @item style -An optional additional style name. Usually it is empty---most long -font names have two hyphens in a row at this point. +An optional additional style name. Usually it is empty---most XLFDs +have two hyphens in a row at this point. @item pixels The font height, in pixels. @item height @@ -853,117 +840,41 @@ frame. The commands you enter with a particular X server apply to that server's selected frame. - It is even possible to use this feature to let two or more users -type simultaneously on the two displays, within the same Emacs job. -In practice, however, the different users can easily interfere with -each others' edits if they are not careful. - -@node Special Buffer Frames -@section Special Buffer Frames - -@vindex special-display-buffer-names - You can make certain chosen buffers, which Emacs normally displays -in ``some other window'' (@pxref{Displaying Buffers}), appear in -special frames of their own. To do this, set the variable -@code{special-display-buffer-names} to a list of buffer names; any -buffer whose name is in that list automatically gets a special frame. -@xref{Window Choice}, for how this fits in with the other ways for -Emacs to choose a window to display in. - - For example, if you set the variable this way, - -@example -(setq special-display-buffer-names - '("*Completions*" "*grep*" "*tex-shell*")) -@end example - -@noindent -then completion lists, @code{grep} output and the @TeX{} mode shell -buffer get individual frames of their own. These frames, and the -windows in them, are never automatically split or reused for any other -buffers. They continue to show the buffers they were created for, -unless you alter them by hand. Killing the special buffer deletes its -frame automatically. - -@vindex special-display-regexps - More generally, you can set @code{special-display-regexps} to a list -of regular expressions; then a buffer gets its own frame if its name -matches any of those regular expressions. (Once again, this applies only -to buffers that normally get displayed for you in ``another window.'') - -@vindex special-display-frame-alist - The variable @code{special-display-frame-alist} specifies the frame -parameters for these frames. It has a default value, so you don't need -to set it. - - For those who know Lisp, an element of -@code{special-display-buffer-names} or @code{special-display-regexps} -can also be a list. Then the first element is the buffer name or -regular expression; the rest of the list specifies how to create the -frame. It can be an association list specifying frame parameter -values; these values take precedence over parameter values specified -in @code{special-display-frame-alist}. If you specify the symbol -@code{same-window} as a ``frame parameter'' in this list, with a -non-@code{nil} value, that means to use the selected window if -possible. If you use the symbol @code{same-frame} as a ``frame -parameter'' in this list, with a non-@code{nil} value, that means to -use the selected frame if possible. - - Alternatively, the value can have this form: - -@example -(@var{function} @var{args}...) -@end example - -@noindent -where @var{function} is a symbol. Then the frame is constructed by -calling @var{function}; its first argument is the buffer, and its -remaining arguments are @var{args}. - @node Frame Parameters -@section Setting Frame Parameters -@cindex Auto-Raise mode -@cindex Auto-Lower mode - - These commands are available for controlling the window management -behavior of the selected frame: - -@table @kbd -@findex auto-raise-mode -@item M-x auto-raise-mode -Toggle whether or not the selected frame should auto-raise. Auto-raise -means that every time you move the mouse onto the frame, it raises the -frame. - -Some window managers also implement auto-raise. If you enable -auto-raise for Emacs frames in your window manager, it will work, but -it is beyond Emacs' control, so @code{auto-raise-mode} has no effect -on it. - -@findex auto-lower-mode -@item M-x auto-lower-mode -Toggle whether or not the selected frame should auto-lower. -Auto-lower means that every time you move the mouse off the frame, -the frame moves to the bottom of the stack on the screen. - -The command @code{auto-lower-mode} has no effect on auto-lower -implemented by the window manager. To control that, you must use the -appropriate window manager features. -@end table - - In Emacs versions that use an X toolkit, the color-setting and -font-setting functions don't affect menus and the menu bar, since they -are displayed by their own widget classes. To change the appearance of -the menus and menu bar, you must use X resources (@pxref{Resources}). -@xref{Colors}, regarding colors. @xref{Font X}, regarding choice of -font. - - Colors, fonts, and other attributes of the frame's display can also -be customized by setting frame parameters in the variable -@code{default-frame-alist} (@pxref{Creating Frames}). For a detailed -description of frame parameters and customization, see @ref{Frame +@section Frame Parameters +@cindex default-frame-alist + + You can control the default appearance and behavior of all frames by +specifying a default list of @dfn{frame parameters} in the variable +@code{default-frame-alist}. Its value should be a list of entries, +each specifying a parameter name and a value for that parameter. +These entries take effect whenever Emacs creates a new frame, +including the initial frame. + +@cindex frame size, specifying default + For example, you can add the following lines to your init file +(@pxref{Init File}) to set the default frame width to 90 character +columns, the default frame height to 40 character rows, and the +default font to @samp{Monospace-10}: + +@example +(add-to-list 'default-frame-alist '(width . 90)) +(add-to-list 'default-frame-alist '(height . 40)) +(add-to-list 'default-frame-alist '(font . "Monospace-10")) +@end example + + For a list of frame parameters and their effects, see @ref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}. +@cindex initial-frame-alist + You can also specify a list of frame parameters which apply to just +the initial frame, by customizing the variable +@code{initial-frame-alist}. + + If Emacs is compiled to use an X toolkit, frame parameters that +specify colors and fonts don't affect menus and the menu bar, since +those are drawn by the toolkit and not directly by Emacs. + @node Scroll Bars @section Scroll Bars @cindex Scroll Bar mode @@ -1007,41 +918,17 @@ bar width, change the @code{scroll-bar-width} frame parameter (@pxref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}). -@node Wheeled Mice -@section Scrolling With ``Wheeled'' Mice - -@cindex mouse wheel -@cindex wheel, mouse -@findex mouse-wheel-mode -@cindex Mouse Wheel minor mode -@cindex mode, Mouse Wheel - Some mice have a ``wheel'' instead of a third button. You can -usually click the wheel to act as either @kbd{Mouse-2} or -@kbd{Mouse-3}, depending on the setup. You can also use the wheel to -scroll windows instead of using the scroll bar or keyboard commands. -Mouse wheel support only works if the system generates appropriate -events; whenever possible, it is turned on by default. To toggle this -feature, use @kbd{M-x mouse-wheel-mode}. - -@vindex mouse-wheel-follow-mouse -@vindex mouse-wheel-scroll-amount -@vindex mouse-wheel-progressive-speed - The two variables @code{mouse-wheel-follow-mouse} and -@code{mouse-wheel-scroll-amount} determine where and by how much -buffers are scrolled. The variable -@code{mouse-wheel-progressive-speed} determines whether the scroll -speed is linked to how fast you move the wheel. - @node Drag and Drop @section Drag and Drop @cindex drag and drop - Emacs supports @dfn{drag and drop} using the mouse. For instance, -dropping text onto an Emacs frame inserts the text where it is dropped. -Dropping a file onto an Emacs frame visits that file. As a special -case, dropping the file on a Dired buffer moves or copies the file -(according to the conventions of the application it came from) into the -directory displayed in that buffer. + In most graphical desktop environments, Emacs has basic support for +@dfn{drag and drop} operations. For instance, dropping text onto an +Emacs frame inserts the text where it is dropped. Dropping a file +onto an Emacs frame visits that file. As a special case, dropping the +file on a Dired buffer moves or copies the file (according to the +conventions of the application it came from) into the directory +displayed in that buffer. @vindex dnd-open-file-other-window Dropping a file normally visits it in the window you drop it on. If @@ -1058,13 +945,12 @@ @findex menu-bar-mode @vindex menu-bar-mode - You can turn display of menu bars on or off with @kbd{M-x -menu-bar-mode} or by customizing the variable @code{menu-bar-mode}. -With no argument, this command toggles Menu Bar mode, a -minor mode. With an argument, the command turns Menu Bar mode on if the -argument is positive, off if the argument is not positive. You can use -the X resource @samp{menuBar} to control the initial setting of -Menu Bar mode. @xref{Resources}. + You can toggle the use of menu bars with @kbd{M-x menu-bar-mode}. +With no argument, this command toggles Menu Bar mode, a global minor +mode. With an argument, the command turns Menu Bar mode on if the +argument is positive, off if the argument is not positive. To control +the use of menu bars at startup, customize the variable +@code{menu-bar-mode}. @kindex C-Mouse-3 @r{(when menu bar is disabled)} Expert users often turn off the menu bar, especially on text-only @@ -1148,47 +1034,39 @@ help text to the GTK+ file chooser dialog; to disable this help text, change the variable @code{x-gtk-file-dialog-help-text} to @code{nil}. -@vindex x-gtk-use-old-file-dialog - In GTK+ versions 2.4 through 2.10, you can choose to use an older -version of the GTK+ file dialog by setting the variable -@code{x-gtk-use-old-file-dialog} to a non-@code{nil} value. If Emacs -is built with a GTK+ version that has only one file dialog, this -variable has no effect. - @node Tooltips @section Tooltips @cindex tooltips - @dfn{Tooltips} are small windows that display text information at the -current mouse position. They activate when there is a pause in mouse -movement. There are two types of tooltip: help tooltips and GUD -tooltips. - - @dfn{Help tooltips} typically display over text---including the mode -line---but are also available for other parts of the Emacs frame, such -as the tool bar and menu items. + @dfn{Tooltips} are small windows that display text information at +the current mouse position. They activate when there is a pause in +mouse movement over some significant piece of text in a window, or the +mode line, or some other part of the Emacs frame such as a tool bar +button or menu item. @findex tooltip-mode - You can toggle display of help tooltips (Tooltip mode) with the -command @kbd{M-x tooltip-mode}. When Tooltip mode is disabled, the -help text is displayed in the echo area instead. - - @dfn{GUD tooltips} show values of variables. They are useful when -you are debugging a program. @xref{Debugger Operation}. + You can toggle the use of tooltips with the command @kbd{M-x +tooltip-mode}. When Tooltip mode is disabled, the help text is +displayed in the echo area instead. To control the use of tooltips at +startup, customize the variable @code{tooltip-mode}. @vindex tooltip-delay The variables @code{tooltip-delay} specifies how long Emacs should wait before displaying a tooltip. For additional customization options for displaying tooltips, use @kbd{M-x customize-group -@key{RET} tooltip @key{RET}}. @xref{X Resources}, for information on -customizing the windows that display tooltips. +@key{RET} tooltip @key{RET}}. @vindex x-gtk-use-system-tooltips If Emacs is built with GTK+ support, it displays tooltips via GTK+, using the default appearance of GTK+ tooltips. To disable this, change the variable @code{x-gtk-use-system-tooltips} to @code{nil}. -If you do this, or if Emacs is built without GTK+ support, the -@code{tooltip} face specifies most attributes of the tooltip text. +If you do this, or if Emacs is built without GTK+ support, most +attributes of the tooltip text are specified by the @code{tooltip} +face, and by X resources (@pxref{X Resources}). + + @dfn{GUD tooltips} are special tooltips that show the values of +variables when debugging a program with GUD. @xref{Debugger +Operation}. @node Mouse Avoidance @section Mouse Avoidance @@ -1261,23 +1139,31 @@ in the mode line when the frame is selected. @node Text-Only Mouse -@section Using a Mouse in Terminal Emulators +@section Using a Mouse in Text-only Terminals @cindex mouse support @cindex terminal emulators, mouse support Some text-only terminals support mouse clicks in the terminal window. @cindex xterm -In a terminal emulator which is compatible with @code{xterm}, -you can use @kbd{M-x xterm-mouse-mode} to give Emacs control over -simple use of the mouse---basically, only non-modified single clicks -are supported. The normal @code{xterm} mouse functionality for such + In a terminal emulator which is compatible with @command{xterm}, you +can use @kbd{M-x xterm-mouse-mode} to give Emacs control over simple +uses of the mouse---basically, only non-modified single clicks are +supported. The normal @command{xterm} mouse functionality for such clicks is still available by holding down the @kbd{SHIFT} key when you press the mouse button. Xterm Mouse mode is a global minor mode (@pxref{Minor Modes}). Repeating the command turns the mode off again. @findex gpm-mouse-mode -In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to -enable terminal mouse support. You must have the gpm package -installed and running on your system in order for this to work. + In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to +enable mouse support. You must have the gpm server installed and +running on your system in order for this to work. + +@iftex +@pxref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features}, +@end iftex +@ifnottex +@pxref{MS-DOS Mouse}, +@end ifnottex +for information about mouse support on MS-DOS. === modified file 'doc/emacs/windows.texi' --- doc/emacs/windows.texi 2011-11-21 06:16:49 +0000 +++ doc/emacs/windows.texi 2011-11-27 08:22:37 +0000 @@ -385,7 +385,8 @@ @item Otherwise, if you specified that the buffer should be displayed in a special frame by customizing @code{special-display-buffer-names} or -@code{special-display-regexps}, do so. @xref{Special Buffer Frames}. +@code{special-display-regexps}, do so. @xref{Choosing Window +Options,,, elisp, The Emacs Lisp Reference Manual}. @vindex pop-up-frames @item ------------------------------------------------------------ revno: 106528 committer: Paul Eggert branch nick: trunk timestamp: Sat 2011-11-26 20:43:11 -0800 message: Spelling fixes. diff: === modified file 'admin/charsets/cp51932.awk' --- admin/charsets/cp51932.awk 2011-11-13 07:48:23 +0000 +++ admin/charsets/cp51932.awk 2011-11-27 04:43:11 +0000 @@ -32,7 +32,7 @@ BEGIN { print ";;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-"; - print ";;; Automatically genrated from CP932-2BYTE.map"; + print ";;; Automatically generated from CP932-2BYTE.map"; print "(let ((map"; printf " '(;JISEXT<->UNICODE"; } === modified file 'doc/emacs/building.texi' --- doc/emacs/building.texi 2011-11-14 23:59:56 +0000 +++ doc/emacs/building.texi 2011-11-27 04:43:11 +0000 @@ -995,7 +995,7 @@ Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}). On a graphical display, this changes the color of a bullet in the margin of a source buffer at the relevant line. This is red when -the breakpoint is enabled and grey when it is disabled. Text-only +the breakpoint is enabled and gray when it is disabled. Text-only terminals correspondingly display a @samp{B} or @samp{b}. @item D === modified file 'doc/lispref/spellfile' --- doc/lispref/spellfile 2011-11-23 07:03:56 +0000 +++ doc/lispref/spellfile 2011-11-27 04:43:11 +0000 @@ -253,7 +253,6 @@ deletion' delq depiction -descendents deselecting destructive' destructively' @@ -299,7 +298,6 @@ exec exitcode expression' -extendible extra' fails' fascist === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2011-11-23 07:03:56 +0000 +++ doc/misc/calc.texi 2011-11-27 04:43:11 +0000 @@ -25644,7 +25644,7 @@ of @samp{<} and @samp{<=} are allowed, or any of the four combinations of @samp{>} and @samp{>=}. Four-argument constructions like @samp{a < b < c < d}, and mixtures like @w{@samp{a < b = c}} that -involve both equalities and inequalities, are not allowed. +involve both equations and inequalities, are not allowed. @kindex a . @pindex calc-remove-equal === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2011-11-20 03:48:53 +0000 +++ doc/misc/eieio.texi 2011-11-27 04:43:11 +0000 @@ -1458,7 +1458,7 @@ @defmethod eieio-speedbar eieio-speedbar-derive-line-path obj depth Return a string representing a directory associated with an instance -of @var{obj}. @var{depth} can be used to indice how many levels of +of @var{obj}. @var{depth} can be used to index how many levels of indentation have been opened by the user where @var{obj} is shown. @end defmethod === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-11-25 07:14:48 +0000 +++ doc/misc/gnus.texi 2011-11-27 04:43:11 +0000 @@ -27408,7 +27408,7 @@ been added. @item -@code{nndoc} was rewritten to be easily extendable (@pxref{Document +@code{nndoc} was rewritten to be easily extensible (@pxref{Document Server Internals}). @item === modified file 'doc/misc/idlwave.texi' --- doc/misc/idlwave.texi 2011-02-23 04:19:28 +0000 +++ doc/misc/idlwave.texi 2011-11-27 04:43:11 +0000 @@ -62,7 +62,7 @@ IDLWAVE is a package which supports editing source code written in the Interactive Data Language (IDL), and running IDL as an inferior shell. -@insertcopying +@insertcopying @end ifnottex @menu @@ -72,8 +72,8 @@ * The IDLWAVE Major Mode:: The mode for editing IDL programs * The IDLWAVE Shell:: The mode for running IDL as an inferior program * Acknowledgements:: Who did what -* Sources of Routine Info:: How does IDLWAVE know about routine XYZ -* HTML Help Browser Tips:: +* Sources of Routine Info:: How does IDLWAVE know about routine XYZ +* HTML Help Browser Tips:: * Configuration Examples:: The user is king * Windows and MacOS:: What still works, and how * Troubleshooting:: When good computers turn bad @@ -85,9 +85,9 @@ Getting Started (Tutorial) -* Lesson I -- Development Cycle:: -* Lesson II -- Customization:: -* Lesson III -- User Catalog:: +* Lesson I -- Development Cycle:: +* Lesson II -- Customization:: +* Lesson III -- User Catalog:: The IDLWAVE Major Mode @@ -107,7 +107,7 @@ Code Formatting * Code Indentation:: Reflecting the logical structure -* Continued Statement Indentation:: +* Continued Statement Indentation:: * Comment Indentation:: Special indentation for comment lines * Continuation Lines:: Splitting statements over lines * Syntax Highlighting:: Font-lock support @@ -115,14 +115,14 @@ Online Help -* Help with HTML Documentation:: -* Help with Source:: +* Help with HTML Documentation:: +* Help with Source:: Completion * Case of Completed Words:: CaseOFcomPletedWords * Object Method Completion and Class Ambiguity:: obj->Method, what? -* Object Method Completion in the Shell:: +* Object Method Completion in the Shell:: * Class and Keyword Inheritance:: obj->Method, _EXTRA=e * Structure Tag Completion:: Completing state.Tag @@ -136,32 +136,32 @@ * Starting the Shell:: How to launch IDL as a subprocess * Using the Shell:: Interactively working with the Shell -* Commands Sent to the Shell:: -* Debugging IDL Programs:: -* Examining Variables:: -* Custom Expression Examination:: +* Commands Sent to the Shell:: +* Debugging IDL Programs:: +* Examining Variables:: +* Custom Expression Examination:: Debugging IDL Programs -* A Tale of Two Modes:: -* Debug Key Bindings:: -* Breakpoints and Stepping:: -* Compiling Programs:: -* Walking the Calling Stack:: -* Electric Debug Mode:: +* A Tale of Two Modes:: +* Debug Key Bindings:: +* Breakpoints and Stepping:: +* Compiling Programs:: +* Walking the Calling Stack:: +* Electric Debug Mode:: Sources of Routine Info * Routine Definitions:: Where IDL Routines are defined. * Routine Information Sources:: So how does IDLWAVE know about... -* Catalogs:: +* Catalogs:: * Load-Path Shadows:: Routines defined in several places * Documentation Scan:: Scanning the IDL Manuals Catalogs -* Library Catalogs:: -* User Catalog:: +* Library Catalogs:: +* User Catalog:: @end detailmenu @end menu @@ -193,13 +193,13 @@ what IDLWAVE does: @itemize @bullet -@item +@item Smart code indentation and automatic-formatting. @item Three level syntax highlighting support. -@item +@item Context-sensitive display of calling sequences and keywords for more -than 1000 native IDL routines, extendible to any additional number of +than 1000 native IDL routines, extensible to any additional number of local routines, and already available with many pre-scanned libraries. @item Fast, context-sensitive online HTML help, or source-header help for @@ -373,9 +373,9 @@ @cindex Getting Started @menu -* Lesson I -- Development Cycle:: -* Lesson II -- Customization:: -* Lesson III -- User Catalog:: +* Lesson I -- Development Cycle:: +* Lesson II -- Customization:: +* Lesson III -- User Catalog:: @end menu @node Lesson I -- Development Cycle, Lesson II -- Customization, Getting Started, Getting Started @@ -418,13 +418,13 @@ y1 = y * delta return, d + floor(m1*30.6)+floor(y1*365.25)+5 end - + function weekday,day,month,year ;; compute weekday number for date nr = daynr(day,month,year) return, nr mod 7 end - + pro plot_wday,day,month ;; Plot the weekday of a date in the first 10 years of this century. years = 2000,+indgen(10) @@ -753,7 +753,7 @@ @menu * Code Indentation:: Reflecting the logical structure -* Continued Statement Indentation:: +* Continued Statement Indentation:: * Comment Indentation:: Special indentation for comment lines * Continuation Lines:: Splitting statements over lines * Syntax Highlighting:: Font-lock support @@ -797,7 +797,7 @@ routine. @xref{Actions}, for information how to impose additional formatting conventions on foreign code. -@defopt idlwave-main-block-indent (@code{2}) +@defopt idlwave-main-block-indent (@code{2}) Extra indentation for the main block of code. That is the block between the FUNCTION/PRO statement and the END statement for that program unit. @@ -998,7 +998,7 @@ @defopt idlwave-use-last-hang-indent (@code{nil}) Non-@code{nil} means use last match on line for -@code{idlwave-indent-regexp}. +@code{idlwave-indent-regexp}. @end defopt @node Syntax Highlighting, Octals and Highlighting, Continuation Lines, Code Formatting @@ -1026,7 +1026,7 @@ @defopt idlwave-default-font-lock-items Items which should be fontified on the default fontification level -2. +2. @end defopt @node Octals and Highlighting, , Syntax Highlighting, Code Formatting @@ -1104,7 +1104,7 @@ On positions 1,2 and 8, information about the @samp{plot} procedure will be shown. On positions 3,4, and 7, the @samp{alog} function will be described, while positions 5 and 6 will investigate the @samp{sin} -function. +function. When you ask for routine information about an object method, and the method exists in several classes, IDLWAVE queries for the class of the @@ -1162,7 +1162,7 @@ @item @i{Other} @tab Any other routine with a file not known to be on the search path. @item @i{Unresolved} -@tab An otherwise unknown routine the shell lists as unresolved +@tab An otherwise unknown routine the shell lists as unresolved (referenced, but not compiled). @end multitable @@ -1198,7 +1198,7 @@ @item @i{Usage} @tab If online help is installed, a click with the @emph{right} mouse button on the @i{Usage:} line will access the help for the -routine (@pxref{Online Help}). +routine (@pxref{Online Help}). @item @i{Keyword} @tab Online help about keywords is also available with the @emph{right} mouse button. Clicking on a keyword with the @emph{middle} @@ -1340,8 +1340,8 @@ @menu -* Help with HTML Documentation:: -* Help with Source:: +* Help with HTML Documentation:: +* Help with Source:: @end menu @node Help with HTML Documentation, Help with Source, Online Help, Online Help @@ -1393,7 +1393,7 @@ Relative directory of the system-supplied HTML help directory, considered with respect to @code{idlwave-system-directory}. Relevant for IDL 6.2 and greater. Should not change. -@end defopt +@end defopt @defopt idlwave-html-help-location @file{/usr/local/etc/} The directory where the @file{idl_html_help} HTML directory live. @@ -1613,7 +1613,7 @@ @menu * Case of Completed Words:: CaseOFcomPletedWords * Object Method Completion and Class Ambiguity:: obj->Method, what? -* Object Method Completion in the Shell:: +* Object Method Completion in the Shell:: * Class and Keyword Inheritance:: obj->Method, _EXTRA=e * Structure Tag Completion:: Completing state.Tag @end menu @@ -1681,7 +1681,7 @@ @code{idlwave-query-class} can be configured to make such prompting the default for all methods (not recommended), or selectively for very common methods for which the number of completing keywords would be too -large (e.g. @code{Init,SetProperty,GetProperty}). +large (e.g. @code{Init,SetProperty,GetProperty}). @cindex Saving object class on @code{->} @cindex @code{->} @@ -1729,7 +1729,7 @@ determine the class of the object. If this query is successful, the class found will be used to select appropriate completions, routine info, or help. If unsuccessful, information from all known classes will -be used (as in the buffer). +be used (as in the buffer). @node Class and Keyword Inheritance, Structure Tag Completion, Object Method Completion in the Shell, Completion @subsection Class and Keyword Inheritance @@ -1772,7 +1772,7 @@ Non-@code{nil} means consider inheritance during completion, online help etc. @end defopt -@defopt idlwave-keyword-class-inheritance +@defopt idlwave-keyword-class-inheritance A list of regular expressions to match methods for which simple class-driven keyword inheritance will be used for Completion. @end defopt @@ -1802,7 +1802,7 @@ simply add the following to your @file{.emacs}: @lisp - (add-hook 'idlwave-load-hook + (add-hook 'idlwave-load-hook (lambda () (require 'idlw-complete-structtag))) @end lisp @@ -2226,7 +2226,7 @@ (idlwave-action-and-binding "\\<\\(pro\\|function\\)\\>[ \t]*\\<" '(capitalize-word 1) t) ;; Capitalize common block name - (idlwave-action-and-binding "\\[ \t]+\\<" + (idlwave-action-and-binding "\\[ \t]+\\<" '(capitalize-word 1) t))) @end lisp @@ -2384,10 +2384,10 @@ @menu * Starting the Shell:: How to launch IDL as a subprocess * Using the Shell:: Interactively working with the Shell -* Commands Sent to the Shell:: -* Debugging IDL Programs:: -* Examining Variables:: -* Custom Expression Examination:: +* Commands Sent to the Shell:: +* Debugging IDL Programs:: +* Examining Variables:: +* Custom Expression Examination:: @end menu @node Starting the Shell, Using the Shell, The IDLWAVE Shell, The IDLWAVE Shell @@ -2414,7 +2414,7 @@ @code{idlwave-shell} with a prefix argument: @kbd{C-u C-c C-s} or @kbd{C-u C-c C-l}. If you always want a dedicated frame for the shell window, configure the variable -@code{idlwave-shell-use-dedicated-frame}. +@code{idlwave-shell-use-dedicated-frame}. To launch a quick IDLWAVE shell directly from a shell prompt without an IDLWAVE buffer (e.g., as a replacement for running inside an @@ -2471,7 +2471,7 @@ Unless it's an absolute path, it goes in @code{idlwave-config-directory}. @end defopt - + @defopt idlwave-shell-use-dedicated-frame (@code{nil}) Non-@code{nil} means IDLWAVE should use a special frame to display the shell buffer. @@ -2574,7 +2574,7 @@ @item @kbd{C-c C-v} @tab Find the source file of a routine (@code{idlwave-find-module}) @item @kbd{C-c C-t} -@tab Find the source file of a routine in the currently visited file +@tab Find the source file of a routine in the currently visited file (@code{idlwave-find-module-this-file}). @item @kbd{C-c =} @tab Compile a library routine (@code{idlwave-resolve}) @@ -2697,12 +2697,12 @@ @end defopt @menu -* A Tale of Two Modes:: -* Debug Key Bindings:: -* Breakpoints and Stepping:: -* Compiling Programs:: -* Walking the Calling Stack:: -* Electric Debug Mode:: +* A Tale of Two Modes:: +* Debug Key Bindings:: +* Breakpoints and Stepping:: +* Compiling Programs:: +* Walking the Calling Stack:: +* Electric Debug Mode:: @end menu @@ -2795,7 +2795,7 @@ stopped will be deleted. To clear all breakpoints, use @kbd{C-c C-d C-a} (@code{idlwave-clear-all-bp}). Breakpoints can also be disabled and re-enabled: @kbd{C-c C-d C-\} -(@code{idlwave-shell-toggle-enable-current-bp}). +(@code{idlwave-shell-toggle-enable-current-bp}). Breakpoint lines are highlighted or indicated with an icon in the source code (different icons for conditional, after, and other break types). @@ -2804,7 +2804,7 @@ specify. IDLWAVE queries the shell for the actual breakpoint location which was set, so the exact line you specify may not be marked. You can re-sync the breakpoint list and update the display at any time (e.g., if -you add or remove some on the command line) using @kbd{C-c C-d C-l}. +you add or remove some on the command line) using @kbd{C-c C-d C-l}. In recent IDLWAVE versions, the breakpoint line is highlighted when the mouse is moved over it, and a tooltip pops up describing the break @@ -2914,8 +2914,8 @@ @kindex C-c C-d C-c In order to compile the current buffer under the IDLWAVE shell, press @kbd{C-c C-d C-c} (@code{idlwave-save-and-run}). This first saves the -current buffer and then sends the command @samp{.run path/to/file} to the -shell. You can also execute @kbd{C-c C-d C-c} from the shell buffer, in +current buffer and then sends the command @samp{.run path/to/file} to the +shell. You can also execute @kbd{C-c C-d C-c} from the shell buffer, in which case the most recently compiled buffer will be saved and re-compiled. @@ -3080,9 +3080,9 @@ @defopt idlwave-shell-electric-stop-color (Violet) Default color of the stopped line overlay when in electric debug mode. -@end defopt +@end defopt -@defopt idlwave-shell-electric-stop-line-face +@defopt idlwave-shell-electric-stop-line-face The face to use for the stopped line. Defaults to a face similar to the modeline, with color @code{idlwave-shell-electric-stop-color}. @end defopt @@ -3188,14 +3188,14 @@ @end defopt @defopt idlwave-shell-output-face -The face for @code{idlwave-shell-output-overlay}. +The face for @code{idlwave-shell-output-overlay}. Allows to choose the font, color and other properties for the most recent output of IDL when examining an expression." @end defopt @defopt idlwave-shell-separate-examine-output (@code{t}) If non-@code{nil}, re-direct the output of examine commands to a special -@file{*Examine*} buffer, instead of in the shell itself. +@file{*Examine*} buffer, instead of in the shell itself. @end defopt @defopt idlwave-shell-max-print-length (200) @@ -3249,17 +3249,17 @@ @lisp (add-hook 'idlwave-shell-mode-hook (lambda () - (idlwave-shell-define-key-both [s-down-mouse-2] - (idlwave-shell-mouse-examine + (idlwave-shell-define-key-both [s-down-mouse-2] + (idlwave-shell-mouse-examine "print, size(___,/DIMENSIONS)")) (idlwave-shell-define-key-both [f9] (idlwave-shell-examine "print, size(___,/DIMENSIONS)")) - (idlwave-shell-define-key-both [f10] (idlwave-shell-examine + (idlwave-shell-define-key-both [f10] (idlwave-shell-examine "print,size(___,/TNAME)")) (idlwave-shell-define-key-both [f11] (idlwave-shell-examine "help,___,/STRUCTURE")))) -@end lisp - +@end lisp + @noindent Now pressing @key{f9}, or middle-mouse dragging with the @key{SUPER} key depressed, will print the dimensions of the nearby or highlighted expression. Pressing @key{f10} will give the type string, @@ -3297,7 +3297,7 @@ everything, modernized IDLWAVE with many new features, and developed the manual. -@item +@item @uref{mailto:jdsmith@@as.arizona.edu, @b{J.D. Smith}}, the current maintainer, as of version 4.10, helped shape object method completion and most new features introduced in versions 4.x, and introduced many @@ -3364,7 +3364,7 @@ @menu * Routine Definitions:: Where IDL Routines are defined. * Routine Information Sources:: So how does IDLWAVE know about... -* Catalogs:: +* Catalogs:: * Load-Path Shadows:: Routines defined in several places * Documentation Scan:: Scanning the IDL Manuals @end menu @@ -3382,7 +3382,7 @@ several places: @enumerate -@item +@item @emph{Builtin routines} are defined inside IDL itself. The source code of such routines is not available, but instead are learned about through the IDL documentation. @@ -3390,7 +3390,7 @@ Routines which are @emph{part of the current program}, are defined in a file explicitly compiled by the user. This file may or may not be located on the IDL search path. -@item +@item @emph{Library routines} are defined in files located on IDL's search path. When a library routine is called for the first time, IDL will find the source file and compile it dynamically. A special sub-category @@ -3428,7 +3428,7 @@ Formerly, this list was created by scanning the IDL manuals to produce the file @file{idlw-rinfo.el}. -@item +@item IDLWAVE @emph{scans} all its @emph{buffers} in the current Emacs session for routine definitions. This is done automatically when routine information or completion is first requested by the user. Each new @@ -3547,8 +3547,8 @@ @end defopt @menu -* Library Catalogs:: -* User Catalog:: +* Library Catalogs:: +* User Catalog:: @end menu @html @@ -3636,7 +3636,7 @@ @itemize @bullet @item The scan is internal to Emacs, so you don't need a working Perl installation, as you do for library catalogs. -@item Can be used to scan directories for which the user has no write +@item Can be used to scan directories for which the user has no write privileges. @item Easy widget-based path selection. @end itemize @@ -3752,7 +3752,7 @@ on the load path is routine info display (@pxref{Routine Info}). @node Documentation Scan, , Load-Path Shadows, Sources of Routine Info -@appendixsec Documentation Scan +@appendixsec Documentation Scan @cindex @file{get_html_rinfo} @cindex @file{idlw-rinfo.el} @cindex Scanning the documentation @@ -3920,7 +3920,7 @@ (setq idlwave-main-block-indent 3) (setq idlwave-end-offset -3) (setq idlwave-continuation-indent 1) -(setq idlwave-begin-line-comment "^;[^;]") ; Leave ";" but not ";;" +(setq idlwave-begin-line-comment "^;[^;]") ; Leave ";" but not ";;" ; anchored at start of line. (setq idlwave-surround-by-blank t) ; Turn on padding ops =,<,> (setq idlwave-pad-keyword nil) ; Remove spaces for keyword '=' @@ -3987,10 +3987,10 @@ ;; (local-set-key "\C-j" 'idlwave-newline) ; My preference. ;; Some personal abbreviations - (define-abbrev idlwave-mode-abbrev-table + (define-abbrev idlwave-mode-abbrev-table (concat idlwave-abbrev-start-char "wb") "widget_base()" (idlwave-keyword-abbrev 1)) - (define-abbrev idlwave-mode-abbrev-table + (define-abbrev idlwave-mode-abbrev-table (concat idlwave-abbrev-start-char "on") "obj_new()" (idlwave-keyword-abbrev 1)) )) @@ -4008,12 +4008,12 @@ (add-hook 'idlwave-shell-mode-hook (lambda () ;; Set up some custom key and mouse examine commands - (idlwave-shell-define-key-both [s-down-mouse-2] - (idlwave-shell-mouse-examine + (idlwave-shell-define-key-both [s-down-mouse-2] + (idlwave-shell-mouse-examine "print, size(___,/DIMENSIONS)")) (idlwave-shell-define-key-both [f9] (idlwave-shell-examine "print, size(___,/DIMENSIONS)")) - (idlwave-shell-define-key-both [f10] (idlwave-shell-examine + (idlwave-shell-define-key-both [f10] (idlwave-shell-examine "print,size(___,/TNAME)")) (idlwave-shell-define-key-both [f11] (idlwave-shell-examine "help,___,/STRUCTURE")))) @@ -4066,7 +4066,7 @@ sure you check the following things: @itemize @bullet -@item When you download the IDLWAVE distribution, make sure you save the +@item When you download the IDLWAVE distribution, make sure you save the file under the names @file{idlwave.tar.gz}. @item M-TAB switches among running programs --- use Esc-TAB instead. @@ -4102,7 +4102,7 @@ if you prefer not to enter electric debug on breakpoints@dots{} but you really should try it before you disable it! You can also customize this variable to enter debug mode when errors are -encountered. +encountered. @item @strong{I get errors like @samp{Searching for program: no such file or directory, idl} when attempting to start the IDL shell.} @@ -4141,7 +4141,7 @@ place, and this is the source of the error. If you recompile (or just "make; make install") from source, it should resolve this problem. Another option is to recompile the @file{idlw*.el} files by hand using -@kbd{M-x byte-compile-file}. +@kbd{M-x byte-compile-file}. @item @strong{@kbd{M-@key{TAB}} doesn't complete words, it switches windows on my desktop.} @@ -4266,7 +4266,7 @@ you downloaded. You need to ensure you download a ``downgrade kit'' if you are using anything older than the latest HTML help package. A new help package appears with each IDL release (assuming the documentation -is updated). +is updated). Starting with IDL 6.2, the HTML help and its catalog are distributed with IDL, and so should never be inconsistent. === modified file 'etc/NEWS.1-17' --- etc/NEWS.1-17 2011-11-23 07:03:56 +0000 +++ etc/NEWS.1-17 2011-11-27 04:43:11 +0000 @@ -1198,7 +1198,7 @@ will come out as `\= is the way to quote \['. The new function `substitute-command-keys' takes a string possibly -contaning \[...] constructs and replaces those constructs with +containing \[...] constructs and replaces those constructs with the key sequences they currently stand for. * Primitives `find-line-comment' and `find-line-comment-body' flushed. === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-11-24 07:44:51 +0000 +++ etc/NEWS.22 2011-11-27 04:43:11 +0000 @@ -1026,7 +1026,7 @@ *** `shadow' face defines the appearance of the "shadowed" text, i.e. the text which should be less noticeable than the surrounding text. -This can be achieved by using shades of grey in contrast with either +This can be achieved by using shades of gray in contrast with either black or white default foreground color. This generic shadow face allows customization of the appearance of shadowed text in one place, so package-specific faces can inherit from it. === modified file 'etc/NEWS.23' --- etc/NEWS.23 2011-11-20 19:35:27 +0000 +++ etc/NEWS.23 2011-11-27 04:43:11 +0000 @@ -793,7 +793,7 @@ terminal frames using emacsclient. **** emacsclient starts emacs in daemon mode and connects to it when ---alternate-editor="" is used (or when the evironment variable +--alternate-editor="" is used (or when the environment variable ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an emacs server. === modified file 'etc/TODO' --- etc/TODO 2011-11-20 19:35:27 +0000 +++ etc/TODO 2011-11-27 04:43:11 +0000 @@ -841,7 +841,7 @@ **** Provide an Error Summary buffer showing all the validation errors. -**** Pop-up menu. What is useful? Tag a region (should be greyed out if +**** Pop-up menu. What is useful? Tag a region (should be grayed out if the region is not balanced). Suggestions based on error messages. **** Have configurable list of namespace URIs so that we can provide === modified file 'etc/e/eterm-color.ti' --- etc/e/eterm-color.ti 2009-08-07 07:04:02 +0000 +++ etc/e/eterm-color.ti 2011-11-27 04:43:11 +0000 @@ -7,7 +7,7 @@ # When updating this file, etc/e/eterm-color should be regenerated by # running "make e/eterm-color" in the etc directory. # Any change to this file should be done at the same time with a -# corresponding change to the TERMCAP evironment variable in term.el. +# corresponding change to the TERMCAP environment variable in term.el. # Comments in term.el specify where each of these capabilities is implemented. colors#8, cols#80, === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-26 08:50:48 +0000 +++ lisp/ChangeLog 2011-11-27 04:43:11 +0000 @@ -2064,7 +2064,7 @@ * window.el (window-auto-delete): Remove. (window-deletable-p): Remove argument FORCE. Don't deal with - dedicatedness and previous buffers. + dedication and previous buffers. (switch-to-prev-buffer): Don't delete window. (delete-windows-on): Delete a window's frame if and only if the window is dedicated. === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2011-11-25 13:26:30 +0000 +++ lisp/ChangeLog.10 2011-11-27 04:43:11 +0000 @@ -1837,7 +1837,7 @@ 2003-05-31 Stefan Monnier * view.el (view-file, view-file-other-window, view-file-other-frame): - Signal an error when trying to visit an inexistent file. + Signal an error when trying to visit a nonexistent file. * vc-hooks.el (vc-call-backend): Give better error message when a backend function is missing. @@ -8053,7 +8053,7 @@ (gdb-quit): Reset some variables including tool-bar-map. * gud.el (gdb-running): New variable. - (gud-menu-map): Use gdb-running to grey out toolbar buttons + (gud-menu-map): Use gdb-running to gray out toolbar buttons with gdba in gdb-ui.el. (gud-tool-bar-map): Move to avoid byte compiler warning. @@ -22790,7 +22790,7 @@ 2001-11-04 Miles Bader * startup.el (fancy-splash-head): Reapply Gerd's hack to make the - shadow of the splash image grey on a dark background instead of black. + shadow of the splash image gray on a dark background instead of black. 2001-11-03 Stefan Monnier === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2011-11-25 07:14:48 +0000 +++ lisp/ChangeLog.12 2011-11-27 04:43:11 +0000 @@ -15100,7 +15100,7 @@ 2005-12-21 Stefan Monnier * emacs-lisp/lisp.el (lisp-complete-symbol): Don't call - delete-windows-on with an inexistent buffer. + delete-windows-on with a nonexistent buffer. 2005-12-22 Nick Roberts @@ -31734,7 +31734,7 @@ 2005-02-23 Stefan Monnier * emacs-lisp/debug.el (debug): Hide the buffer if it's not killed. - Remove unused and inexistent var `inhibit-trace'. + Remove unused and nonexistent var `inhibit-trace'. (debugger-mode): Use run-mode-hooks. (debugger-list-functions): Add buttons; setup xref stack. === modified file 'lisp/ChangeLog.5' --- lisp/ChangeLog.5 2011-11-20 19:35:27 +0000 +++ lisp/ChangeLog.5 2011-11-27 04:43:11 +0000 @@ -2579,7 +2579,7 @@ 1995-03-13 Karl Fogel * bookmark.el: Removed C-v bindings; they were inconsistent. - Defvarred some variables to nil, solely to avoid compilation warnings. + Defvared some variables to nil, solely to avoid compilation warnings. Use "Author's Update Number:" instead of "Version:". (bookmark-history): New var. (bookmark-completing-read): Use `bookmark-history'. === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2011-11-25 13:26:30 +0000 +++ lisp/ChangeLog.7 2011-11-27 04:43:11 +0000 @@ -15185,7 +15185,7 @@ 1997-06-16 Dan Nicolaescu * icon.el (icon-indent-line): A comment ends at the end of the - line, delete call to inexistent function. + line, delete call to nonexistent function. * icon.el (icon-font-lock-keywords-1): Improved regexp. (icon-font-lock-keywords-2): Likewise. @@ -19552,7 +19552,7 @@ * term.el: Added a lot of new faces, they all start with term- and follow a simple lexicographical convention. Note that each change is commented: just search for -mm in the source. - (term-char-mode): Added all the "grey-keys" to term-raw-map. + (term-char-mode): Added all the "gray-keys" to term-raw-map. (term-send-up): Similar, decided to go for the more xterm-like \eOA bindings in place of the previous \e[A. (term-buffer-maximum-size): New variable. === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2011-11-25 07:14:48 +0000 +++ lisp/ChangeLog.8 2011-11-27 04:43:11 +0000 @@ -4294,7 +4294,7 @@ 1999-07-21 Gerd Moellmann - * faces.el (toolbar): Grey default background. + * faces.el (toolbar): Gray default background. (modeline): Ditto. * image.el (image-type-regexps): New. === modified file 'lisp/allout.el' --- lisp/allout.el 2011-11-24 01:58:14 +0000 +++ lisp/allout.el 2011-11-27 04:43:11 +0000 @@ -1952,7 +1952,7 @@ plain BULLETs are by default used, according to the DEPTH of the TOPIC. Choice among the distinctive BULLETs is offered when you provide a universal argument (\\[universal-argument]) to the - TOPIC creation command, or when explictly rebulleting a TOPIC. The + TOPIC creation command, or when explicitly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for more details. === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2011-09-02 16:38:40 +0000 +++ lisp/bookmark.el 2011-11-27 04:43:11 +0000 @@ -83,7 +83,7 @@ "The `.emacs.bmk' file used to be called this name.") -;; defvarred to avoid a compilation warning: +;; defvared to avoid a compilation warning: (defvar bookmark-file nil "Old name for `bookmark-default-file'.") === modified file 'lisp/cedet/ede/autoconf-edit.el' --- lisp/cedet/ede/autoconf-edit.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/ede/autoconf-edit.el 2011-11-27 04:43:11 +0000 @@ -191,7 +191,7 @@ Assume that MACRO doesn't appear in the buffer yet, so search the ordering list `autoconf-preferred-macro-order'." ;; Search this list backwards.. heh heh heh - ;; This lets us do a reverse search easilly. + ;; This lets us do a reverse search easily. (let ((ml (member macro (reverse autoconf-preferred-macro-order)))) (if (not ml) (error "Don't know how to position for %s yet" macro)) (setq ml (cdr ml)) === modified file 'lisp/cedet/ede/proj.el' --- lisp/cedet/ede/proj.el 2011-11-18 08:31:02 +0000 +++ lisp/cedet/ede/proj.el 2011-11-27 04:43:11 +0000 @@ -546,7 +546,7 @@ (file-name-extension (car sources)) ""))) )) - ;; Return the disovered compilers + ;; Return the discovered compilers. comp))) (defmethod ede-proj-linkers ((obj ede-proj-target)) @@ -580,7 +580,7 @@ (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype))) (setq avail (cdr avail))) (setq link (cdr avail))))) - ;; Return the disovered linkers + ;; Return the discovered linkers. link))) === modified file 'lisp/cedet/semantic/analyze.el' --- lisp/cedet/semantic/analyze.el 2011-11-23 07:03:56 +0000 +++ lisp/cedet/semantic/analyze.el 2011-11-27 04:43:11 +0000 @@ -57,7 +57,7 @@ ;; ;; context - A semantic datatype representing a point in a buffer. ;; -;; constriant - If a context specifies a specific datatype is needed, +;; constraint - If a context specifies a specific datatype is needed, ;; that is a constraint. ;; constants - Some datatypes define elements of themselves as a ;; constant. These need to be returned as there would be no === modified file 'lisp/composite.el' --- lisp/composite.el 2011-10-19 12:54:24 +0000 +++ lisp/composite.el 2011-11-27 04:43:11 +0000 @@ -656,7 +656,7 @@ (if (not (char-charset (lglyph-char glyph) coding)) (progn ;; As the terminal doesn't support this glyph, return a - ;; gstring in which each glyph is its own graphme-cluster + ;; gstring in which each glyph is its own grapheme-cluster ;; of width 1.. (setq i 0) (while (and (< i nglyphs) === modified file 'lisp/dframe.el' --- lisp/dframe.el 2011-11-20 07:30:16 +0000 +++ lisp/dframe.el 2011-11-27 04:43:11 +0000 @@ -718,7 +718,7 @@ (defun dframe-set-timer (timeout fn &optional _null-on-error) "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil. -TIMEOUT is the number of seconds until the dframe controled program +TIMEOUT is the number of seconds until the dframe controlled program timer is called again. When TIMEOUT is nil, turn off all timeouts. This function must be called from the buffer belonging to the program who requested the timer. NULL-ON-ERROR is ignored." === modified file 'lisp/emacs-lisp/byte-opt.el' --- lisp/emacs-lisp/byte-opt.el 2011-11-14 06:27:12 +0000 +++ lisp/emacs-lisp/byte-opt.el 2011-11-27 04:43:11 +0000 @@ -135,7 +135,7 @@ ;; We'd have to notice defvars and defconsts, since those variables should ;; always be dynamic, and attempting to do a lexical binding of them ;; should simply do a dynamic binding instead. -;; But! We need to know about variables that were not necessarily defvarred +;; But! We need to know about variables that were not necessarily defvared ;; in the file being compiled (doing a boundp check isn't good enough.) ;; Fdefvar() would have to be modified to add something to the plist. ;; === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2011-11-20 04:33:36 +0000 +++ lisp/emacs-lisp/bytecomp.el 2011-11-27 04:43:11 +0000 @@ -178,9 +178,9 @@ ;; This can be the 'byte-compile property of any symbol. (autoload 'byte-compile-inline-expand "byte-opt") -;; This is the entrypoint to the lapcode optimizer pass1. +;; This is the entry point to the lapcode optimizer pass1. (autoload 'byte-optimize-form "byte-opt") -;; This is the entrypoint to the lapcode optimizer pass2. +;; This is the entry point to the lapcode optimizer pass2. (autoload 'byte-optimize-lapcode "byte-opt") (autoload 'byte-compile-unfold-lambda "byte-opt") === modified file 'lisp/emacs-lisp/cconv.el' --- lisp/emacs-lisp/cconv.el 2011-11-25 13:26:30 +0000 +++ lisp/emacs-lisp/cconv.el 2011-11-27 04:43:11 +0000 @@ -67,7 +67,7 @@ ;; TODO: (not just for cconv but also for the lexbind changes in general) ;; - let (e)debug find the value of lexical variables from the stack. -;; - make eval-region do the eval-sexp-add-defvars danse. +;; - make eval-region do the eval-sexp-add-defvars dance. ;; - byte-optimize-form should be applied before cconv. ;; OTOH, the warnings emitted by cconv-analyze need to come before optimize ;; since afterwards they can because obnoxious (warnings about an "unused === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2011-11-18 16:30:43 +0000 +++ lisp/emacs-lisp/smie.el 2011-11-27 04:43:11 +0000 @@ -579,7 +579,7 @@ (smie-debug--describe-cycle table (smie-debug--prec2-cycle csts))))) (incf i 10)) - ;; Propagate equalities back to their source. + ;; Propagate equality constraints back to their sources. (dolist (eq (nreverse eqs)) (when (null (cadr eq)) ;; There's an equality constraint, but we still haven't given === modified file 'lisp/filesets.el' --- lisp/filesets.el 2011-01-26 08:36:39 +0000 +++ lisp/filesets.el 2011-11-27 04:43:11 +0000 @@ -267,12 +267,12 @@ (not ignore-flag))) (defun filesets-set-default! (sym val) - "Call `filestes-set-default' and reset cached data (i.e. rebuild menu)." + "Call `filesets-set-default' and reset cached data (i.e. rebuild menu)." (when (filesets-set-default sym val) (filesets-reset-fileset))) (defun filesets-set-default+ (sym val) - "Call `filestes-set-default' and reset filesets' standard menu." + "Call `filesets-set-default' and reset filesets' standard menu." (when (filesets-set-default sym val) (setq filesets-has-changed-flag t))) ; (filesets-reset-fileset nil t))) === modified file 'lisp/follow.el' --- lisp/follow.el 2011-11-25 07:14:48 +0000 +++ lisp/follow.el 2011-11-27 04:43:11 +0000 @@ -351,7 +351,7 @@ ;; global map. (easy-menu-add-item nil '("Tools") '("Follow" - ;; The Emacs code used to just grey out operations when follow-mode was + ;; The Emacs code used to just gray out operations when follow-mode was ;; not enabled, whereas the XEmacs code used to remove it altogether. ;; Not sure which is preferable, but clearly the preference should not ;; depend on the flavor. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-25 13:26:30 +0000 +++ lisp/gnus/ChangeLog 2011-11-27 04:43:11 +0000 @@ -10961,7 +10961,7 @@ 2007-11-14 Denys Duchier (tiny change) * pop3.el (pop3-open-server): Accept and process data more robustly at - connexion start to avoid spurious "POP SSL connexion failed" errors. + connection start to avoid spurious "POP SSL connection failed" errors. 2007-11-14 Katsumi Yamaoka @@ -16516,7 +16516,7 @@ 2005-07-01 Katsumi Yamaoka * gnus-art.el (article-display-face): Improve the efficiency. - (article-display-x-face): Ditto; remove grey x-face stuff. + (article-display-x-face): Ditto; remove gray x-face stuff. 2005-06-30 Katsumi Yamaoka === modified file 'lisp/gnus/ChangeLog.1' --- lisp/gnus/ChangeLog.1 2011-11-23 07:03:56 +0000 +++ lisp/gnus/ChangeLog.1 2011-11-27 04:43:11 +0000 @@ -3471,7 +3471,7 @@ * pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs 19.34. - * nneething.el (nneething-directory): Defvarred. + * nneething.el (nneething-directory): Defvared. * message.el: Autoloaded nndraft things. (message-set-auto-save-file-name): Use it. === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2011-11-25 13:26:30 +0000 +++ lisp/gnus/ChangeLog.2 2011-11-27 04:43:11 +0000 @@ -5120,7 +5120,7 @@ * gnus-util.el (gnus-prin1-to-string): Bind print-length and print-level. - * gnus-art.el (article-display-x-face): Removed grey x-face stuff. + * gnus-art.el (article-display-x-face): Removed gray x-face stuff. (gnus-treat-display-grey-xface): Removed. * gnus-fun.el (gnus-grab-cam-face): New. @@ -9836,7 +9836,7 @@ 2002-02-08 ShengHuo ZHU * gnus-art.el (gnus-treat-display-grey-xface): New variable. - (article-display-x-face): Use it. Disable grey xface, if + (article-display-x-face): Use it. Disable gray xface, if uncompface is not found. * message.el (message-mode): Don't enable multibyte on an indirect @@ -11350,7 +11350,7 @@ * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed. * gnus-art.el (gnus-ignored-headers): Hide all X-Faces. - (article-display-x-face): Display grey X-Faces. + (article-display-x-face): Display gray X-Faces. * gnus-fun.el (gnus-convert-gray-x-face-region): New function. (gnus-convert-gray-x-face-to-ppm): Ditto. === modified file 'lisp/gnus/mm-bodies.el' --- lisp/gnus/mm-bodies.el 2011-05-20 00:03:51 +0000 +++ lisp/gnus/mm-bodies.el 2011-11-27 04:43:11 +0000 @@ -87,9 +87,9 @@ (goto-char (point-min)) (if (re-search-forward "[^\x0-\x7f]" nil t) (or mail-parse-charset - (message-options-get 'mm-encody-body-charset) + (message-options-get 'mm-body-charset-encoding-alist) (message-options-set - 'mm-encody-body-charset + 'mm-body-charset-encoding-alist (mm-read-coding-system "Charset used in the article: "))) ;; The logic in `mml-generate-mime-1' confirms that it's OK ;; to return nil here. === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2011-10-26 09:25:34 +0000 +++ lisp/gnus/mml.el 2011-11-27 04:43:11 +0000 @@ -1454,7 +1454,7 @@ "Display current buffer with Gnus, in a new buffer. If RAW, display a raw encoded MIME message. -The window layout for the preview buffer is controled by the variables +The window layout for the preview buffer is controlled by the variables `special-display-buffer-names', `special-display-regexps', or `gnus-buffer-configuration' (the first match made will be used), or the `pop-to-buffer' function." === modified file 'lisp/gnus/nnml.el' --- lisp/gnus/nnml.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/nnml.el 2011-11-27 04:43:11 +0000 @@ -1213,7 +1213,7 @@ ;; #### already belongs to a range, whereas the corresponding ;; #### article doesn't exist (for example, if you delete an ;; #### article). For that reason, it is important to update - ;; #### the ranges (meaning remove inexistent articles) before + ;; #### the ranges (meaning remove nonexistent articles) before ;; #### doing anything on them. ;; 2 a/ read articles: (let ((read (gnus-info-read info))) === modified file 'lisp/gnus/pop3.el' --- lisp/gnus/pop3.el 2011-09-26 21:59:47 +0000 +++ lisp/gnus/pop3.el 2011-11-27 04:43:11 +0000 @@ -270,11 +270,11 @@ message-count)) (defcustom pop3-stream-type nil - "*Transport security type for POP3 connexions. -This may be either nil (plain connexion), `ssl' (use an + "*Transport security type for POP3 connections. +This may be either nil (plain connection), `ssl' (use an SSL/TSL-secured stream) or `starttls' (use the starttls mechanism to turn on TLS security after opening the stream). However, if -this is nil, `ssl' is assumed for connexions to port +this is nil, `ssl' is assumed for connections to port 995 (pop3s)." :version "23.1" ;; No Gnus :group 'pop3 === modified file 'lisp/ido.el' --- lisp/ido.el 2011-11-19 09:18:31 +0000 +++ lisp/ido.el 2011-11-27 04:43:11 +0000 @@ -1692,7 +1692,7 @@ (defun ido-nonreadable-directory-p (dir) ;; Return t if dir is a directory, but not readable ;; Do not check for non-readable directories via tramp, as this causes a premature - ;; connect on incomplete tramp paths (after entring just method:). + ;; connect on incomplete tramp paths (after entering just method:). (let ((ido-enable-tramp-completion nil)) (and (ido-final-slash dir) (not (ido-is-unc-host dir)) @@ -1702,7 +1702,7 @@ (defun ido-directory-too-big-p (dir) ;; Return t if dir is a directory, but too big to show ;; Do not check for non-readable directories via tramp, as this causes a premature - ;; connect on incomplete tramp paths (after entring just method:). + ;; connect on incomplete tramp paths (after entering just method:). (let ((ido-enable-tramp-completion nil)) (and (numberp ido-max-directory-size) (ido-final-slash dir) === modified file 'lisp/international/cp51932.el' --- lisp/international/cp51932.el 2011-01-15 23:16:57 +0000 +++ lisp/international/cp51932.el 2011-11-27 04:43:11 +0000 @@ -1,5 +1,5 @@ ;;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*- -;;; Automatically genrated from CP932-2BYTE.map +;;; Automatically generated from CP932-2BYTE.map (let ((map '(;JISEXT<->UNICODE (#x2D21 . #x2460) @@ -468,4 +468,3 @@ (setcar x (cdr x)) (setcdr x tmp))) map) (define-translation-table 'cp51932-encode map)) - === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-11-26 08:26:37 +0000 +++ lisp/ldefs-boot.el 2011-11-27 04:43:11 +0000 @@ -819,7 +819,7 @@ plain BULLETs are by default used, according to the DEPTH of the TOPIC. Choice among the distinctive BULLETs is offered when you provide a universal argument (\\[universal-argument]) to the - TOPIC creation command, or when explictly rebulleting a TOPIC. The + TOPIC creation command, or when explicitly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for more details. @@ -10040,7 +10040,7 @@ If ARG is a list of numbers, point is placed according to the first member of the list, but you can visit the other specified positions -cyclicaly with the functions `expand-jump-to-previous-slot' and +cyclically with the functions `expand-jump-to-previous-slot' and `expand-jump-to-next-slot'. If ARG is omitted, point is placed at the end of the expanded text. @@ -24377,7 +24377,7 @@ rechecking will be paused whenever there is input pending. By default, uses a vacuous schema that allows any well-formed XML -document. A schema can be specified explictly using +document. A schema can be specified explicitly using \\[rng-set-schema-file-and-validate], or implicitly based on the buffer's file name or on the root element name. In each case the schema must be a RELAX NG schema using the compact schema (such schemas === modified file 'lisp/man.el' --- lisp/man.el 2011-10-01 20:32:01 +0000 +++ lisp/man.el 2011-11-27 04:43:11 +0000 @@ -1095,7 +1095,7 @@ (replace-match "+") (put-text-property (1- (point)) (point) 'face 'bold)) ;; When the header is longer than the manpage name, groff tries to - ;; condense it to a shorter line interspered with ^H. Remove ^H with + ;; condense it to a shorter line interspersed with ^H. Remove ^H with ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566) (goto-char (point-min)) (while (re-search-forward ".\b" nil t) (backward-delete-char 2)) @@ -1189,7 +1189,7 @@ (goto-char (point-min)) (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+")) ;; When the header is longer than the manpage name, groff tries to - ;; condense it to a shorter line interspered with ^H. Remove ^H with + ;; condense it to a shorter line interspersed with ^H. Remove ^H with ;; their preceding chars (but don't put Man-overstrike-face). (Bug#5566) (goto-char (point-min)) (while (re-search-forward ".\b" nil t) (backward-delete-char 2)) === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2011-11-24 01:58:14 +0000 +++ lisp/mh-e/ChangeLog.1 2011-11-27 04:43:11 +0000 @@ -7385,7 +7385,7 @@ (mh-visit-folder) alias, and v (mh-visit-folder). (mh-index-folder-mode-help-messages): Changes for above. (mh-index-folder-message-menu, mh-index-folder-folder-menu): New - menus. I decided to delete the unavailable items since greying out + menus. I decided to delete the unavailable items since graying out implies that the user can do something to access them. In this case, that's not the case. Well, that's not entirely true--the user could write code for those functions ;-). === modified file 'lisp/mpc.el' --- lisp/mpc.el 2011-11-20 07:30:16 +0000 +++ lisp/mpc.el 2011-11-27 04:43:11 +0000 @@ -1651,7 +1651,7 @@ ;;; Hierarchical tagbrowser ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Todo: ;; - Add a button on each dir to open/close it (?) -;; - add the parent dir on the previous line, greyed-out, if it's not +;; - add the parent dir on the previous line, grayed-out, if it's not ;; present (because we're in the non-selected part and the parent is ;; in the selected part). === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2011-11-24 01:58:14 +0000 +++ lisp/net/ange-ftp.el 2011-11-27 04:43:11 +0000 @@ -49,7 +49,7 @@ ;; 'user@' part may be omitted. This syntax can be customized to a certain ;; extent by changing ange-ftp-name-format. There are limitations. ;; The `host' part has an optional suffix `#port' which may be used to -;; specify a non-default port number for the connexion. +;; specify a non-default port number for the connection. ;; ;; If the user part is omitted then ange-ftp generates a default user ;; instead whose value depends on the variable ange-ftp-default-user. === modified file 'lisp/nxml/rng-valid.el' --- lisp/nxml/rng-valid.el 2011-01-26 08:36:39 +0000 +++ lisp/nxml/rng-valid.el 2011-11-27 04:43:11 +0000 @@ -230,7 +230,7 @@ rechecking will be paused whenever there is input pending. By default, uses a vacuous schema that allows any well-formed XML -document. A schema can be specified explictly using +document. A schema can be specified explicitly using \\[rng-set-schema-file-and-validate], or implicitly based on the buffer's file name or on the root element name. In each case the schema must be a RELAX NG schema using the compact schema \(such schemas === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2011-11-20 02:29:42 +0000 +++ lisp/org/org-agenda.el 2011-11-27 04:43:11 +0000 @@ -800,7 +800,7 @@ :group 'org-agenda-todo-list :type '(choice (const :tag "Do not dim" nil) - (const :tag "Dim to a grey face" t) + (const :tag "Dim to a gray face" t) (const :tag "Make invisible" invisible))) (defcustom org-timeline-show-empty-dates 3 === modified file 'lisp/play/gomoku.el' --- lisp/play/gomoku.el 2011-04-21 12:24:46 +0000 +++ lisp/play/gomoku.el 2011-11-27 04:43:11 +0000 @@ -379,7 +379,7 @@ best-square square score-max score) (aset gomoku-score-table square -1))) ; no: kill it ! - ;; If score is equally good, choose randomly. But first check freeness: + ;; If score is equally good, choose randomly. But first check freedom: ((not (zerop (aref gomoku-board square))) (aset gomoku-score-table square -1)) ((zerop (random (setq count (1+ count)))) === modified file 'lisp/play/landmark.el' --- lisp/play/landmark.el 2011-11-17 09:09:20 +0000 +++ lisp/play/landmark.el 2011-11-27 04:43:11 +0000 @@ -385,7 +385,7 @@ best-square square score-max score) (aset landmark-score-table square -1))) ; no: kill it ! - ;; If score is equally good, choose randomly. But first check freeness: + ;; If score is equally good, choose randomly. But first check freedom: ((not (zerop (aref landmark-board square))) (aset landmark-score-table square -1)) ((zerop (random (setq count (1+ count)))) === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2011-11-23 07:03:56 +0000 +++ lisp/progmodes/ada-mode.el 2011-11-27 04:43:11 +0000 @@ -3939,7 +3939,7 @@ ;; processing them recursively avoids the need for any special ;; handling. ;; Nothing should be done if we have only the specs or a - ;; generic instantion. + ;; generic instantiation. ((and (looking-at "\\")) (if first @@ -4401,7 +4401,7 @@ (ada-goto-matching-end 1)) ;; on first line of subprogram body - ;; Do nothing for specs or generic instantion, since these are + ;; Do nothing for specs or generic instantiation, since these are ;; handled as the general case (find the enclosing block) ;; We also need to make sure that we ignore nested subprograms ((save-excursion === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2011-11-20 03:48:53 +0000 +++ lisp/progmodes/cc-langs.el 2011-11-27 04:43:11 +0000 @@ -433,7 +433,7 @@ the new syntax, as accepted by `modify-syntax-entry'." ;; The $ character is not allowed in most languages (one exception ;; is Java which allows it for legacy reasons) but we still classify - ;; it as an indentifier character since it's often used in various + ;; it as an identifier character since it's often used in various ;; machine generated identifiers. t '((?_ . "w") (?$ . "w")) (objc java) (append '((?@ . "w")) === modified file 'lisp/progmodes/cperl-mode.el' --- lisp/progmodes/cperl-mode.el 2011-11-25 07:14:48 +0000 +++ lisp/progmodes/cperl-mode.el 2011-11-27 04:43:11 +0000 @@ -1388,12 +1388,12 @@ ;;; These two must be unwound, otherwise take exponential time (defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*" -"Regular expression to match optional whitespace with interpspersed comments. +"Regular expression to match optional whitespace with interspersed comments. Should contain exactly one group.") ;;; This one is tricky to unwind; still very inefficient... (defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+" -"Regular expression to match whitespace with interpspersed comments. +"Regular expression to match whitespace with interspersed comments. Should contain exactly one group.") === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2011-11-17 17:40:48 +0000 +++ lisp/progmodes/f90.el 2011-11-27 04:43:11 +0000 @@ -724,7 +724,7 @@ ["Reset to Saved" Custom-reset-saved :active t :help "Reset all edited or set settings to saved"] ["Reset to Standard Settings" Custom-reset-standard :active t - :help "Erase all cusomizations in buffer"] + :help "Erase all customizations in buffer"] ) "--" ["Indent Subprogram" f90-indent-subprogram t] === modified file 'lisp/progmodes/fortran.el' --- lisp/progmodes/fortran.el 2011-11-17 17:40:48 +0000 +++ lisp/progmodes/fortran.el 2011-11-27 04:43:11 +0000 @@ -665,7 +665,7 @@ ["Reset to Saved" Custom-reset-saved :active t :help "Reset all edited or set settings to saved"] ["Reset to Standard Settings" Custom-reset-standard :active t - :help "Erase all cusomizations in buffer"] + :help "Erase all customizations in buffer"] ) "--" ["Comment Region" fortran-comment-region mark-active] === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2011-11-24 01:58:14 +0000 +++ lisp/progmodes/gud.el 2011-11-27 04:43:11 +0000 @@ -103,7 +103,7 @@ (defvar gud-running nil "Non-nil if debugged program is running. -Used to grey out relevant toolbar icons.") +Used to gray out relevant toolbar icons.") (defvar gud-target-name "--unknown--" "The apparent name of the program being debugged in a gud buffer.") === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2011-11-23 07:03:56 +0000 +++ lisp/progmodes/idlw-shell.el 2011-11-27 04:43:11 +0000 @@ -2903,7 +2903,7 @@ ;; Move to beginning of current or previous expression (if (looking-at "\\<\\|(") ;; At beginning of expression, don't move backwards unless - ;; this is at the end of an indentifier. + ;; this is at the end of an identifier. (if (looking-at "\\>") (backward-sexp)) (backward-sexp)) === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2011-11-15 17:37:37 +0000 +++ lisp/progmodes/sql.el 2011-11-27 04:43:11 +0000 @@ -96,7 +96,7 @@ ;; This improves the interaction under Emacs but it still is somewhat ;; awkward. -;; Quoted identifiers are not supported for hilighting. Most +;; Quoted identifiers are not supported for highlighting. Most ;; databases support the use of double quoted strings in place of ;; identifiers; ms (Microsoft SQLServer) also supports identifiers ;; enclosed within brackets []. @@ -1329,9 +1329,9 @@ ;; are not followed closely, and most vendors offer significant ;; capabilities beyond those defined in the standard specifications. -;; SQL mode provides support for hilighting based on the product. In -;; addition to hilighting the product keywords, any ANSI keywords not -;; used by the product are also hilighted. This will help identify +;; SQL mode provides support for highlighting based on the product. In +;; addition to highlighting the product keywords, any ANSI keywords not +;; used by the product are also highlighted. This will help identify ;; keywords that could be restricted in future versions of the product ;; or might be a problem if ported to another product. @@ -2506,7 +2506,7 @@ "Configure font-lock and imenu with product-specific settings. The KEYWORDS-ONLY flag is passed to font-lock to specify whether -only keywords should be hilighted and syntactic hilighting +only keywords should be highlighted and syntactic highlighting skipped. The IMENU flag indicates whether `imenu-mode' should also be configured." @@ -3807,7 +3807,7 @@ ;; Note that making KEYWORDS-ONLY nil will cause havoc if you try ;; SELECT 'x' FROM DUAL with SQL*Plus, because the title of the column - ;; will have just one quote. Therefore syntactic hilighting is + ;; will have just one quote. Therefore syntactic highlighting is ;; disabled for interactive buffers. No imenu support. (sql-product-font-lock t nil) === modified file 'lisp/replace.el' --- lisp/replace.el 2011-11-20 02:29:42 +0000 +++ lisp/replace.el 2011-11-27 04:43:11 +0000 @@ -1663,7 +1663,7 @@ t t))) (defun replace-loop-through-replacements (data count) - ;; DATA is a vector contaning the following values: + ;; DATA is a vector containing the following values: ;; 0 next-rotate-count ;; 1 repeat-count ;; 2 next-replacement === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2011-11-20 02:29:42 +0000 +++ lisp/speedbar.el 2011-11-27 04:43:11 +0000 @@ -2101,7 +2101,7 @@ ;; If the shown files variable has extra directories, then ;; it is our responsibility to redraw them all ;; Luckily, the nature of inserting items into this list means - ;; that by reversing it, we can easilly go in the right order + ;; that by reversing it, we can easily go in the right order (let ((sf (cdr (reverse speedbar-shown-directories)))) (setq speedbar-shown-directories (list (expand-file-name default-directory))) === modified file 'lisp/term.el' --- lisp/term.el 2011-11-23 07:03:56 +0000 +++ lisp/term.el 2011-11-27 04:43:11 +0000 @@ -40,7 +40,7 @@ ;; overhead this has became so small that IMHO is surely outweighted by ;; the benefits you get but, as usual, YMMV ;; -;; Important caveat, when deciding the cursor/'grey keys' keycodes I had to +;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to ;; make a choice: on my Linux box this choice allows me to run all the ;; ncurses applications without problems but make these keys ;; incomprehensible to all the cursesX programs. Your mileage may vary so @@ -910,7 +910,7 @@ (setq term-raw-escape-map (copy-keymap (lookup-key (current-global-map) "\C-x"))) - ;; Added nearly all the 'grey keys' -mm + ;; Added nearly all the 'gray keys' -mm (if (featurep 'xemacs) (define-key term-raw-map [button2] 'term-mouse-paste) === modified file 'lisp/term/common-win.el' --- lisp/term/common-win.el 2011-01-25 04:08:28 +0000 +++ lisp/term/common-win.el 2011-11-27 04:43:11 +0000 @@ -281,11 +281,11 @@ ;; The ordering of the colors is chosen for the user's convenience in ;; `list-colors-display', which displays the reverse of this list. ;; Roughly speaking, `list-colors-display' orders by (i) named shades -;; of grey with hue 0.0, sorted by value (ii) named colors with +;; of gray with hue 0.0, sorted by value (ii) named colors with ;; saturation 1.0, sorted by hue, (iii) named non-white colors with ;; saturation less than 1.0, sorted by hue, (iv) other named shades of ;; white, (v) numbered colors sorted by hue, and (vi) numbered shades -;; of grey. +;; of gray. (declare-function ns-list-colors "nsfns.m" (&optional frame)) === modified file 'lisp/textmodes/conf-mode.el' --- lisp/textmodes/conf-mode.el 2011-11-20 02:29:42 +0000 +++ lisp/textmodes/conf-mode.el 2011-11-27 04:43:11 +0000 @@ -185,7 +185,7 @@ (2 'font-lock-constant-face nil t)) ;; section { ... } (do this last because some assign ...{...) ("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend)) - "Keywords to hilight in Conf mode.") + "Keywords to highlight in Conf mode.") (defvar conf-javaprop-font-lock-keywords '(;; var=val @@ -197,7 +197,7 @@ (5 'font-lock-variable-name-face nil t) (6 'font-lock-constant-face nil t) (7 'font-lock-variable-name-face nil t))) - "Keywords to hilight in Conf Java Properties mode.") + "Keywords to highlight in Conf Java Properties mode.") (defvar conf-space-keywords-alist '(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head") @@ -240,7 +240,7 @@ (1 'font-lock-variable-name-face)) ;; section { ... } (do this last because some assign ...{...) ("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend)) - "Keywords to hilight in Conf Colon mode.") + "Keywords to highlight in Conf Colon mode.") (defvar conf-assignment-sign ?= "Sign used for assignments (char or string).") === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2011-11-16 17:47:25 +0000 +++ lisp/textmodes/ispell.el 2011-11-27 04:43:11 +0000 @@ -2399,7 +2399,8 @@ (setq start (1+ start)))) ; On block non-refresh, inc start. (let ((modified (buffer-modified-p)) ; don't allow this fn to modify buffer (buffer-read-only nil) ; Allow highlighting read-only buffers. - (text (buffer-substring-no-properties start end)) ; Save hilight region + (text (buffer-substring-no-properties start end)) + ; Save highlight region. (inhibit-quit t) ; inhibit interrupt processing here. (buffer-undo-list t)) ; don't clutter the undo list. (goto-char end) @@ -3977,7 +3978,7 @@ ; LocalWords: Francais Nederlands charset autoloaded popup nonmenu regexp num ; LocalWords: AMStex hspace includeonly nocite epsfig displaymath eqnarray reg ; LocalWords: minipage modeline pers dict unhighlight buf grep sync prev inc -; LocalWords: fn hilight oldot NB AIX msg init read's bufs pt cmd Quinlan eg +; LocalWords: fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg ; LocalWords: uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable ; LocalWords: lns XEmacs HTML casechars Multibyte === modified file 'lisp/textmodes/reftex-sel.el' --- lisp/textmodes/reftex-sel.el 2011-01-25 04:08:28 +0000 +++ lisp/textmodes/reftex-sel.el 2011-11-27 04:43:11 +0000 @@ -570,13 +570,13 @@ nil t) (beginning-of-line)) (defun reftex-select-next-heading (&optional arg) - "Move to next table of contentes line." + "Move to next table of contents line." (interactive "p") (end-of-line) (re-search-forward "^ " nil t arg) (beginning-of-line)) (defun reftex-select-previous-heading (&optional arg) - "Move to previous table of contentes line." + "Move to previous table of contents line." (interactive "p") (re-search-backward "^ " nil t arg)) (defun reftex-select-quit () === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2011-11-17 17:40:48 +0000 +++ lisp/textmodes/rst.el 2011-11-27 04:43:11 +0000 @@ -2716,7 +2716,7 @@ (rst-define-level-faces))) ;; Faces for displaying items on several levels; these definitions define -;; different shades of grey where the lightest one (i.e. least contrasting) is +;; different shades of gray where the lightest one (i.e. least contrasting) is ;; used for level 1 (defcustom rst-level-face-max 6 "Maximum depth of levels for which section title faces are defined." === modified file 'lisp/textmodes/tex-mode.el' --- lisp/textmodes/tex-mode.el 2011-11-15 07:55:13 +0000 +++ lisp/textmodes/tex-mode.el 2011-11-27 04:43:11 +0000 @@ -2254,7 +2254,7 @@ ;; Remove those commands whose input was considered stable for ;; some other command (typically if (t . "%.pdf") is inactive ;; then we're using pdflatex and the fact that the dvi file - ;; is inexistent doesn't matter). + ;; is nonexistent doesn't matter). (let ((tmp nil)) (dolist (cmd cmds) (unless (member (nth 1 cmd) unchanged-in) === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2011-11-15 17:37:37 +0000 +++ lisp/url/ChangeLog 2011-11-27 04:43:11 +0000 @@ -1977,7 +1977,7 @@ * lisp/url-gw.el (url-gw-inhibit-code-conversion): Remove. (url-open-stream): Bind coding-system-for{read,write} when setting - up the connexion. Don't call url-gw-inhibit-code-conversion. + up the connection. Don't call url-gw-inhibit-code-conversion. 2001-05-24 William M. Perry @@ -2516,4 +2516,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - === modified file 'lisp/vc/ediff-help.el' --- lisp/vc/ediff-help.el 2011-01-25 04:08:28 +0000 +++ lisp/vc/ediff-help.el 2011-11-27 04:43:11 +0000 @@ -50,7 +50,7 @@ (defconst ediff-long-help-message-compare3 " p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y -n,SPC -next diff | h -hilighting | rx -restore buf X's old diff +n,SPC -next diff | h -highlighting | rx -restore buf X's old diff j -jump to diff | @ -auto-refinement | * -refine current region gx -goto X's point| ## -ignore whitespace | ! -update diff regions C-l -recenter | #c -ignore case | @@ -64,7 +64,7 @@ (defconst ediff-long-help-message-compare2 " p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A -n,SPC -next diff | h -hilighting | rx -restore buf X's old diff +n,SPC -next diff | h -highlighting | rx -restore buf X's old diff j -jump to diff | @ -auto-refinement | * -refine current region gx -goto X's point| ## -ignore whitespace | ! -update diff regions C-l -recenter | #c -ignore case | @@ -78,7 +78,7 @@ (defconst ediff-long-help-message-narrow2 " p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A -n,SPC -next diff | h -hilighting | rx -restore buf X's old diff +n,SPC -next diff | h -highlighting | rx -restore buf X's old diff j -jump to diff | @ -auto-refinement | * -refine current region gx -goto X's point| ## -ignore whitespace | ! -update diff regions C-l -recenter | #c -ignore case | % -narrow/widen buffs @@ -92,7 +92,7 @@ (defconst ediff-long-help-message-word-mode " p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y -n,SPC -next diff | h -hilighting | rx -restore buf X's old diff +n,SPC -next diff | h -highlighting | rx -restore buf X's old diff j -jump to diff | | gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs C-l -recenter | #c -ignore case | @@ -106,7 +106,7 @@ (defconst ediff-long-help-message-merge " p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C -n,SPC -next diff | h -hilighting | r -restore buf C's old diff +n,SPC -next diff | h -highlighting | r -restore buf C's old diff j -jump to diff | @ -auto-refinement | * -refine current region gx -goto X's point| ## -ignore whitespace | ! -update diff regions C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions === modified file 'lisp/window.el' --- lisp/window.el 2011-11-25 15:43:34 +0000 +++ lisp/window.el 2011-11-27 04:43:11 +0000 @@ -170,7 +170,7 @@ window to a height less than the one specified here, an application should instead call `window-resize' with a non-nil IGNORE argument. In order to have `split-window' make a window -shorter, explictly specify the SIZE argument of that function." +shorter, explicitly specify the SIZE argument of that function." :type 'integer :version "24.1" :group 'windows) @@ -190,7 +190,7 @@ window to a width less than the one specified here, an application should instead call `window-resize' with a non-nil IGNORE argument. In order to have `split-window' make a window -narrower, explictly specify the SIZE argument of that function." +narrower, explicitly specify the SIZE argument of that function." :type 'integer :version "24.1" :group 'windows) === modified file 'src/ChangeLog.10' --- src/ChangeLog.10 2011-11-25 13:26:30 +0000 +++ src/ChangeLog.10 2011-11-27 04:43:11 +0000 @@ -23013,7 +23013,7 @@ (try_window_id): Likewise. (redisplay_window): New local var buffer_unchanged_p. - * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass. + * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_hourglass. * process.c (create_process): Test USG_SUBTTY_WORKS. (process_send_signal): Clean up handling of GID. === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-11-25 13:26:30 +0000 +++ src/ChangeLog.11 2011-11-27 04:43:11 +0000 @@ -22234,7 +22234,7 @@ * lisp.h (Fdelete_terminal): Declare. * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID) - (CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of + (CHECK_CHARSET_GET_ATTR): Don't use the nonexistent return value of wrong_type_argument. 2008-02-22 Kenichi Handa @@ -31330,7 +31330,7 @@ 2007-05-12 Chong Yidong - * image.c (pbm_load): Correctly check image size for greyscale pbm. + * image.c (pbm_load): Correctly check image size for grayscale pbm. * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC). === modified file 'src/ChangeLog.3' --- src/ChangeLog.3 2011-11-23 07:03:56 +0000 +++ src/ChangeLog.3 2011-11-27 04:43:11 +0000 @@ -3271,7 +3271,7 @@ [not HAVE_X11] (x_set_border_pixel): Use gray_width and gray_height, instead of assuming that the bitmap is 16x16. (x_make_gc): Instead of creating a pixmap and then calling - XPutImage to make it into a grey stipple, just call + XPutImage to make it into a gray stipple, just call XCreatePixmapFromBitmapData to do it all at once. * xterm.c (x_text_icon): Move the request for font information === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2011-11-26 08:26:37 +0000 +++ src/ChangeLog.8 2011-11-27 04:43:11 +0000 @@ -5409,7 +5409,7 @@ 1998-11-10 Gerd Moellmann - * xrdb.c (x_load_resources): Add grey background colors as + * xrdb.c (x_load_resources): Add gray background colors as defaults for menus, scroll bars, and dialogs. * insdel.c (prepare_to_modify_buffer): Move setting === modified file 'src/buffer.c' --- src/buffer.c 2011-11-23 09:57:27 +0000 +++ src/buffer.c 2011-11-27 04:43:11 +0000 @@ -1631,7 +1631,7 @@ /* Reset the local variables, so that this buffer's local values won't be protected from GC. They would be protected - if they happened to remain encached in their symbols. + if they happened to remain cached in their symbols. This gets rid of them for certain. */ swap_out_buffer_local_variables (b); reset_buffer_local_variables (b, 1); @@ -2486,7 +2486,7 @@ Lisp_Object sym = XCAR (XCAR (alist)); eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED); /* Need not do anything if some other buffer's binding is - now encached. */ + now cached. */ if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer)) { /* Symbol is set up for this buffer's old local value: === modified file 'src/charset.c' --- src/charset.c 2011-11-20 03:48:53 +0000 +++ src/charset.c 2011-11-27 04:43:11 +0000 @@ -166,9 +166,9 @@ maximum character of the current charset. */ int min_char, max_char; - /* A Unicode character correspoinding to the code indice 0 (i.e. the + /* A Unicode character corresponding to the code index 0 (i.e. the minimum code-point) of the current charset, or -1 if the code - indice 0 is not a Unicode character. This is checked when + index 0 is not a Unicode character. This is checked when table.encoder[CHAR] is zero. */ int zero_index_char; === modified file 'src/dispextern.h' --- src/dispextern.h 2011-11-20 03:48:53 +0000 +++ src/dispextern.h 2011-11-27 04:43:11 +0000 @@ -405,7 +405,7 @@ { /* Metrics of a partial glyph of an image (type == IMAGE_GLYPH). */ struct glyph_slice img; - /* Start and end indices of glyphs of a graphme cluster of a + /* Start and end indices of glyphs of a grapheme cluster of a composition (type == COMPOSITE_GLYPH). */ struct { int from, to; } cmp; /* Pixel offsets for upper and lower part of the acronym. */ === modified file 'src/gtkutil.h' --- src/gtkutil.h 2011-07-28 23:58:05 +0000 +++ src/gtkutil.h 2011-11-27 04:43:11 +0000 @@ -98,7 +98,7 @@ struct _widget_value *val, GCallback select_cb, GCallback deactivate_cb, - GCallback hightlight_cb); + GCallback highlight_cb); extern void xg_modify_menubar_widgets (GtkWidget *menubar, FRAME_PTR f, @@ -106,7 +106,7 @@ int deep_p, GCallback select_cb, GCallback deactivate_cb, - GCallback hightlight_cb); + GCallback highlight_cb); extern int xg_update_frame_menubar (FRAME_PTR f); === modified file 'src/lisp.h' --- src/lisp.h 2011-11-20 03:07:02 +0000 +++ src/lisp.h 2011-11-27 04:43:11 +0000 @@ -324,7 +324,7 @@ struct { - /* Use explict signed, the signedness of a bit-field of type + /* Use explicit signed, the signedness of a bit-field of type int is implementation defined. */ signed EMACS_INT val : VALBITS; ENUM_BF (Lisp_Type) type : GCTYPEBITS; @@ -349,7 +349,7 @@ struct { ENUM_BF (Lisp_Type) type : GCTYPEBITS; - /* Use explict signed, the signedness of a bit-field of type + /* Use explicit signed, the signedness of a bit-field of type int is implementation defined. */ signed EMACS_INT val : VALBITS; } s; === modified file 'src/lread.c' --- src/lread.c 2011-11-19 09:18:31 +0000 +++ src/lread.c 2011-11-27 04:43:11 +0000 @@ -1917,7 +1917,7 @@ This function does not move point. */) (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function) { - /* FIXME: Do the eval-sexp-add-defvars danse! */ + /* FIXME: Do the eval-sexp-add-defvars dance! */ int count = SPECPDL_INDEX (); Lisp_Object tem, cbuf; === modified file 'src/nsterm.m' --- src/nsterm.m 2011-11-23 07:03:56 +0000 +++ src/nsterm.m 2011-11-27 04:43:11 +0000 @@ -559,7 +559,7 @@ { NSView *view = FRAME_NS_VIEW (f); /* This no-op will trigger the default window placing - * constriant system. */ + * constraint system. */ f->output_data.ns->dont_constrain = 0; [[view window] setFrameOrigin:[[view window] frame].origin]; } === modified file 'src/w32fns.c' --- src/w32fns.c 2011-11-23 07:03:56 +0000 +++ src/w32fns.c 2011-11-27 04:43:11 +0000 @@ -5011,7 +5011,8 @@ cursor. Duplicated from xdisp.c, but cannot use the version there due to lack of atimers on w32. */ #define DEFAULT_HOURGLASS_DELAY 1 -/* Return non-zero if houglass timer has been started or hourglass is shown. */ +/* Return non-zero if hourglass timer has been started or hourglass is + shown. */ /* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in xdisp.c could be used. */ === modified file 'src/widget.c' --- src/widget.c 2011-09-09 01:06:52 +0000 +++ src/widget.c 2011-11-27 04:43:11 +0000 @@ -808,7 +808,7 @@ return result->request_mode ? XtGeometryAlmost : XtGeometryYes; } -/* Special entrypoints */ +/* Special entry points */ void EmacsFrameSetCharSize (Widget widget, int columns, int rows) { === modified file 'src/widget.h' --- src/widget.h 2011-01-25 04:08:28 +0000 +++ src/widget.h 2011-11-27 04:43:11 +0000 @@ -92,9 +92,8 @@ extern struct _DisplayContext* display_context; -/* Special entrypoints */ +/* Special entry points */ void EmacsFrameSetCharSize (Widget, int, int); void widget_store_internal_border (Widget widget); #endif /* _EmacsFrame_h */ - === modified file 'src/window.c' --- src/window.c 2011-11-23 16:09:08 +0000 +++ src/window.c 2011-11-27 04:43:11 +0000 @@ -3088,7 +3088,7 @@ error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name))); else /* WINDOW is weakly dedicated to its buffer, reset - dedicatedness. */ + dedication. */ w->dedicated = Qnil; call1 (Qrecord_window_buffer, window); @@ -6299,7 +6299,7 @@ ignore_positions non-zero means ignore non-matching scroll positions and the like. - This ignores a couple of things like the dedicatedness status of + This ignores a couple of things like the dedication status of window, combination_limit and the like. This might have to be fixed. */ === modified file 'src/xdisp.c' --- src/xdisp.c 2011-11-25 19:52:46 +0000 +++ src/xdisp.c 2011-11-27 04:43:11 +0000 @@ -28662,7 +28662,8 @@ /* Platform-independent portion of hourglass implementation. */ -/* Return non-zero if houglass timer has been started or hourglass is shown. */ +/* Return non-zero if hourglass timer has been started or hourglass is + shown. */ int hourglass_started (void) { === modified file 'src/xfaces.c' --- src/xfaces.c 2011-11-15 07:55:13 +0000 +++ src/xfaces.c 2011-11-27 04:43:11 +0000 @@ -66,7 +66,7 @@ attributes (1st thru 5th) are updated from the spec. On the other hand, if one of the other font-related attributes are - specified, the correspoinding specs in this attribute is set to nil. + specified, the corresponding specs in this attribute is set to nil. 15. A face name or list of face names from which to inherit attributes. @@ -1223,7 +1223,7 @@ int gray_p; if (defined_color (f, color_name, &color, 0)) - gray_p = (/* Any color sufficiently close to black counts as grey. */ + gray_p = (/* Any color sufficiently close to black counts as gray. */ (color.red < 5000 && color.green < 5000 && color.blue < 5000) || ((eabs (color.red - color.green)