Now on revision 106667. ------------------------------------------------------------ revno: 106667 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-12-12 15:25:58 +0800 message: More updates to Building chapter of Emacs manual. * doc/emacs/building.texi (Executing Lisp): Fix xref for C-M-x. (Lisp Libraries): Add xref to node explaining `load' in Lisp manual. Note that load-path is not customizable. (Lisp Eval): Note that listed commands are available globally. Explain the meaning of "defun" in the C-M-x context. (Lisp Interaction): Copyedits. (External Lisp): Fix name of inferior Lisp buffer. Mention Scheme. (Compilation): Define "inferior process". diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-12-12 05:32:49 +0000 +++ doc/emacs/ChangeLog 2011-12-12 07:25:58 +0000 @@ -1,3 +1,15 @@ +2011-12-12 Chong Yidong + + * building.texi (Executing Lisp): Fix xref for C-M-x. + (Lisp Libraries): Add xref to node explaining `load' in Lisp + manual. Note that load-path is not customizable. + (Lisp Eval): Note that listed commands are available globally. + Explain the meaning of "defun" in the C-M-x context. + (Lisp Interaction): Copyedits. + (External Lisp): Fix name of inferior Lisp buffer. Mention + Scheme. + (Compilation): Define "inferior process". + 2011-12-10 Eli Zaretskii * msdog.texi (Windows Fonts): Document how to force GDI font === modified file 'doc/emacs/building.texi' --- doc/emacs/building.texi 2011-12-10 07:39:43 +0000 +++ doc/emacs/building.texi 2011-12-12 07:25:58 +0000 @@ -24,9 +24,9 @@ * Executing Lisp:: Various modes for editing Lisp programs, with different facilities for running the Lisp programs. -* Libraries: Lisp Libraries. Creating Lisp programs to run in Emacs. -* Eval: Lisp Eval. Executing a single Lisp expression in Emacs. -* Interaction: Lisp Interaction. Executing Lisp in an Emacs buffer. +* Lisp Libraries:: How Lisp programs are loaded into Emacs. +* Lisp Eval:: Executing a single Lisp expression in Emacs. +* Lisp Interaction:: Executing Lisp in an Emacs buffer. * External Lisp:: Communicating through Emacs with a separate Lisp. @end menu @@ -37,10 +37,9 @@ @cindex compilation errors @cindex error log - Emacs can run compilers for languages such as C and Fortran as -inferior processes, feeding the compilation log into an Emacs buffer. -It can also parse the error messages and show you where the errors -occurred. + Emacs can run compilers for languages such as C and Fortran, feeding +the compilation log into an Emacs buffer. It can also parse the error +messages and show you where the errors occurred. @table @kbd @item M-x compile @@ -56,11 +55,11 @@ @findex compile To run @code{make} or another compilation command, type @kbd{M-x compile}. This reads a shell command line using the minibuffer, and -then executes the command in an inferior shell, putting output in the -buffer named @samp{*compilation*}. The current buffer's default -directory is used as the working directory for the execution of the -command; normally, therefore, compilation takes place in this -directory. +then executes the command by running a shell as a subprocess (or +@dfn{inferior process}) of Emacs. The output is inserted in a buffer +named @samp{*compilation*}. The current buffer's default directory is +used as the working directory for the execution of the command; +normally, therefore, compilation takes place in this directory. @vindex compile-command The default compilation command is @samp{make -k}, which is usually @@ -1286,109 +1285,119 @@ @node Executing Lisp @section Executing Lisp Expressions - Emacs has several different major modes for Lisp and Scheme. They are -the same in terms of editing commands, but differ in the commands for -executing Lisp expressions. Each mode has its own purpose. + Emacs has major modes for several variants of Lisp. They use the +same editing commands as other programming language modes +(@pxref{Programs}). In addition, they provide special commands for +executing Lisp expressions. @table @asis -@item Emacs-Lisp mode -The mode for editing source files of programs to run in Emacs Lisp. -This mode defines @kbd{C-M-x} to evaluate the current defun. -@xref{Lisp Libraries}. +@item Emacs Lisp mode +The mode for editing Emacs Lisp source files. It defines @kbd{C-M-x} +to evaluate the current top-level Lisp expression. @xref{Lisp Eval}. + @item Lisp Interaction mode -The mode for an interactive session with Emacs Lisp. It defines -@kbd{C-j} to evaluate the sexp before point and insert its value in the +The mode for an interactive Emacs Lisp session. It defines @kbd{C-j} +to evaluate the expression before point and insert its value in the buffer. @xref{Lisp Interaction}. + @item Lisp mode The mode for editing source files of programs that run in Lisps other -than Emacs Lisp. This mode defines @kbd{C-M-x} to send the current defun -to an inferior Lisp process. @xref{External Lisp}. +than Emacs Lisp. It defines @kbd{C-M-x} to evaluate the current +top-level expression in an external Lisp. @xref{External Lisp}. + @item Inferior Lisp mode -The mode for an interactive session with an inferior Lisp process. -This mode combines the special features of Lisp mode and Shell mode -(@pxref{Shell Mode}). +The mode for an interactive session with an external Lisp which is +being run as a subprocess (or @dfn{inferior process}) of Emacs. +@ifnottex +@xref{External Lisp}. +@end ifnottex + @item Scheme mode -Like Lisp mode but for Scheme programs. +Like Lisp mode, but for Scheme programs. + @item Inferior Scheme mode -The mode for an interactive session with an inferior Scheme process. +Like Inferior Lisp mode, but for Scheme. @end table - Most editing commands for working with Lisp programs are in fact -available globally. @xref{Programs}. - @node Lisp Libraries @section Libraries of Lisp Code for Emacs @cindex libraries @cindex loading Lisp code - Lisp code for Emacs editing commands is stored in files whose names -conventionally end in @file{.el}. This ending tells Emacs to edit them in -Emacs-Lisp mode (@pxref{Executing Lisp}). + Emacs Lisp code is stored in files whose names conventionally end in +@file{.el}. Such files are automatically visited in Emacs Lisp mode. @cindex byte code Emacs Lisp code can be compiled into byte-code, which loads faster, -takes up less space, and executes faster. @xref{Byte Compilation,, -Byte Compilation, elisp, the Emacs Lisp Reference Manual}. By -convention, the compiled code for a library goes in a separate file -whose name ends in @samp{.elc}. Thus, the compiled code for -@file{foo.el} goes in @file{foo.elc}. +takes up less space, and executes faster. By convention, compiled +Emacs Lisp code goes in a separate file whose name ends in +@samp{.elc}. For example, the compiled code for @file{foo.el} goes in +@file{foo.elc}. @xref{Byte Compilation,, Byte Compilation, elisp, the +Emacs Lisp Reference Manual}. @findex load-file - To execute a file of Emacs Lisp code, use @kbd{M-x load-file}. This -command reads a file name using the minibuffer and then executes the -contents of that file as Lisp code. It is not necessary to visit the -file first; in any case, this command reads the file as found on disk, -not text in an Emacs buffer. + To @dfn{load} an Emacs Lisp file, type @kbd{M-x load-file}. This +command reads a file name using the minibuffer, and executes the +contents of that file as Emacs Lisp code. It is not necessary to +visit the file first; this command reads the file directly from disk, +not from an existing Emacs buffer. @findex load @findex load-library - Once a file of Lisp code is installed in the Emacs Lisp library -directories, users can load it using @kbd{M-x load-library}. Programs -can load it by calling @code{load}, a more primitive function that is -similar but accepts some additional arguments. - - @kbd{M-x load-library} differs from @kbd{M-x load-file} in that it -searches a sequence of directories and tries three file names in each -directory. Suppose your argument is @var{lib}; the three names are -@file{@var{lib}.elc}, @file{@var{lib}.el}, and lastly just -@file{@var{lib}}. If @file{@var{lib}.elc} exists, it is by convention -the result of compiling @file{@var{lib}.el}; it is better to load the -compiled file, since it will load and run faster. - - If @code{load-library} finds that @file{@var{lib}.el} is newer than -@file{@var{lib}.elc} file, it issues a warning, because it's likely -that somebody made changes to the @file{.el} file and forgot to -recompile it. Nonetheless, it loads @file{@var{lib}.elc}. This is -because people often leave unfinished edits the source file, and don't -recompile it until they think it is ready to use. +@cindex load path for Emacs Lisp + If an Emacs Lisp file is installed in the Emacs Lisp @dfn{load path} +(defined below), you can load it by typing @kbd{M-x load-library}, +instead of using @kbd{M-x load-file}. The @kbd{M-x load-library} +command prompts for a @dfn{library name} rather than a file name; it +searches through each directory in the Emacs Lisp load path, trying to +find a file matching that library name. If the library name is +@samp{@var{foo}}, it tries looking for files named +@file{@var{foo}.elc}, @file{@var{foo}.el}, and lastly just +@file{@var{foo}}; the first one found is loaded. This command prefers +@file{.elc} files over @file{.el} files because compiled files load +and run faster. If it finds that @file{@var{lib}.el} is newer than +@file{@var{lib}.elc}, it issues a warning, in case someone made +changes to the @file{.el} file and forgot to recompile it, but loads +the @file{.elc} file anyway. (Due to this behavior, you can save +unfinished edits to Emacs Lisp source files, and not recompile until +your changes are ready for use.) + + Emacs Lisp programs usually load Emacs Lisp files using the +@code{load} function. This is similar to @code{load-library}, but is +lower-level and accepts additional arguments. @xref{How Programs Do +Loading,,, elisp, the Emacs Lisp Reference Manual}. @vindex load-path - The variable @code{load-path} specifies the sequence of directories -searched by @kbd{M-x load-library}. Its value should be a list of -strings that are directory names; in addition, @code{nil} in this list -stands for the current default directory. (Generally, it is not a -good idea to put @code{nil} in the list; if you find yourself wishing + The Emacs Lisp load path is specified by the variable +@code{load-path}. Its value should be a list of directory names +(strings). These directories are searched, in the specified order, by +the @kbd{M-x load-library} command, the lower-level @code{load} +function, and other Emacs functions that find Emacs Lisp libraries. A +list entry in @code{load-path} can also have the special value +@code{nil}, which stands for the current default directory, but it is +almost always a bad idea to use this. (If you find yourself wishing that @code{nil} were in the list, most likely what you really want is -to do @kbd{M-x load-file} this once.) +to use @kbd{M-x load-file}.) The default value of @code{load-path} is a list of directories where the Lisp code for Emacs itself is stored. If you have libraries of -your own, put them in a single directory and add that directory to -@code{load-path}, by adding a line like this to your init file -(@pxref{Init File}): +your own in another directory, you can add that directory to the load +path. Unlike most other variables described in this manual, +@code{load-path} cannot be changed via the Customize interface +(@pxref{Easy Customization}), but you can add a directory to it by +putting a line like this in your init file (@pxref{Init File}): @example -(add-to-list 'load-path "/path/to/lisp/libraries") +(add-to-list 'load-path "/path/to/my/lisp/library") @end example @cindex autoload - Some commands are @dfn{autoloaded}: when you run them, Emacs will -automatically load the associated library first. For instance, the -@code{compile} and @code{compilation-mode} commands -(@pxref{Compilation}) are autoloaded; if you call either command, -Emacs automatically loads the @code{compile} library. In contrast, -the command @code{recompile} is not autoloaded, so it is unavailable -until you load the @code{compile} library. + Some commands are @dfn{autoloaded}: when you run them, Emacs +automatically loads the associated library first. For instance, the +@kbd{M-x compile} command (@pxref{Compilation}) is autoloaded; if you +call it, Emacs automatically loads the @code{compile} library first. +In contrast, the command @kbd{M-x recompile} is not autoloaded, so it +is unavailable until you load the @code{compile} library. @vindex load-dangerous-libraries @cindex Lisp files byte-compiled by XEmacs @@ -1399,38 +1408,35 @@ @node Lisp Eval @section Evaluating Emacs Lisp Expressions -@cindex Emacs-Lisp mode -@cindex mode, Emacs-Lisp +@cindex Emacs Lisp mode +@cindex mode, Emacs Lisp @findex emacs-lisp-mode - Lisp programs intended to be run in Emacs should be edited in -Emacs-Lisp mode; this happens automatically for file names ending in -@file{.el}. By contrast, Lisp mode itself is used for editing Lisp -programs intended for other Lisp systems. To switch to Emacs-Lisp mode -explicitly, use the command @kbd{M-x emacs-lisp-mode}. - - For testing of Lisp programs to run in Emacs, it is often useful to -evaluate part of the program as it is found in the Emacs buffer. For -example, after changing the text of a Lisp function definition, -evaluating the definition installs the change for future calls to the -function. Evaluation of Lisp expressions is also useful in any kind of -editing, for invoking noninteractive functions (functions that are -not commands). - -@table @kbd -@item M-: -Read a single Lisp expression in the minibuffer, evaluate it, and print -the value in the echo area (@code{eval-expression}). -@item C-x C-e -Evaluate the Lisp expression before point, and print the value in the -echo area (@code{eval-last-sexp}). -@item C-M-x + Emacs Lisp mode is the major mode for editing Emacs Lisp. Its mode +command is @kbd{M-x emacs-lisp-mode}. + + Emacs provides several commands for evaluating Emacs Lisp +expressions. You can use these commands in Emacs Lisp mode, to test +your Emacs Lisp code as it is being written. For example, after +re-writing a function, you can evaluate the function definition to +make it take effect for subsequent function calls. These commands are +also available globally, and can be used outside Emacs Lisp mode. + +@table @asis +@item @kbd{M-:} +Read a single Emacs Lisp expression in the minibuffer, evaluate it, +and print the value in the echo area (@code{eval-expression}). +@item @kbd{C-x C-e} +Evaluate the Emacs Lisp expression before point, and print the value +in the echo area (@code{eval-last-sexp}). +@item @kbd{C-M-x} @r{(in Emacs Lisp mode)} +@itemx @kbd{M-x eval-defun} Evaluate the defun containing or after point, and print the value in the echo area (@code{eval-defun}). -@item M-x eval-region -Evaluate all the Lisp expressions in the region. -@item M-x eval-buffer -Evaluate all the Lisp expressions in the buffer. +@item @kbd{M-x eval-region} +Evaluate all the Emacs Lisp expressions in the region. +@item @kbd{M-x eval-buffer} +Evaluate all the Emacs Lisp expressions in the buffer. @end table @ifinfo @@ -1442,150 +1448,144 @@ @kindex M-: @end ifnotinfo @findex eval-expression - @kbd{M-:} (@code{eval-expression}) is the most basic command for evaluating -a Lisp expression interactively. It reads the expression using the -minibuffer, so you can execute any expression on a buffer regardless of -what the buffer contains. When the expression is evaluated, the current -buffer is once again the buffer that was current when @kbd{M-:} was -typed. - -@kindex C-M-x @r{(Emacs-Lisp mode)} -@findex eval-defun - In Emacs-Lisp mode, the key @kbd{C-M-x} is bound to the command -@code{eval-defun}, which parses the defun containing or following point -as a Lisp expression and evaluates it. The value is printed in the echo -area. This command is convenient for installing in the Lisp environment -changes that you have just made in the text of a function definition. - - @kbd{C-M-x} treats @code{defvar} expressions specially. Normally, -evaluating a @code{defvar} expression does nothing if the variable it -defines already has a value. But @kbd{C-M-x} unconditionally resets the -variable to the initial value specified in the @code{defvar} expression. -@code{defcustom} expressions are treated similarly. -This special feature is convenient for debugging Lisp programs. -Typing @kbd{C-M-x} on a @code{defface} expression reinitializes -the face according to the @code{defface} specification. + @kbd{M-:} (@code{eval-expression}) reads an expression using the +minibuffer, and evaluates it. (Before evaluating the expression, the +current buffer switches back to the buffer that was current when you +typed @kbd{M-:}, not the minibuffer into which you typed the +expression.) @kindex C-x C-e @findex eval-last-sexp - The command @kbd{C-x C-e} (@code{eval-last-sexp}) evaluates the Lisp -expression preceding point in the buffer, and displays the value in the -echo area. It is available in all major modes, not just Emacs-Lisp -mode. It does not treat @code{defvar} specially. - - When the result of an evaluation is an integer, you can type -@kbd{C-x C-e} a second time to display the value of the integer result -in additional formats (octal, hexadecimal, and character). - - If @kbd{C-x C-e}, or @kbd{M-:} is given a numeric argument, it -inserts the value into the current buffer at point, rather than -displaying it in the echo area. The argument's value does not matter. -@kbd{C-M-x} with a numeric argument instruments the function -definition for Edebug (@pxref{Instrumenting, Instrumenting for Edebug,, elisp, the Emacs Lisp Reference Manual}). + The command @kbd{C-x C-e} (@code{eval-last-sexp}) evaluates the +Emacs Lisp expression preceding point in the buffer, and displays the +value in the echo area. When the result of an evaluation is an +integer, you can type @kbd{C-x C-e} a second time to display the value +of the integer result in additional formats (octal, hexadecimal, and +character). + + If @kbd{M-:} or @kbd{C-x C-e} is given a prefix argument, it inserts +the value into the current buffer at point, rather than displaying it +in the echo area. The argument's value does not matter. + +@kindex C-M-x @r{(Emacs Lisp mode)} +@findex eval-defun + The @code{eval-defun} command is bound to @kbd{C-M-x} in Emacs Lisp +mode. It evaluates the top-level Lisp expression containing or +following point, and prints the value in the echo area. In this +context, a top-level expression is referred to as a ``defun'', but it +need not be an actual @code{defun} (function definition). In +particular, this command treats @code{defvar} expressions specially. +Normally, evaluating a @code{defvar} expression does nothing if the +variable it defines already has a value. But this command +unconditionally resets the variable to the initial value specified by +the @code{defvar}; this is convenient for debugging Emacs Lisp +programs. @code{defcustom} and @code{defface} expressions are treated +similarly. Note that the other commands documented in this section do +not have this special feature. + + With a prefix argument, @kbd{C-M-x} instruments the function +definition for Edebug, the Emacs Lisp Debugger. @xref{Instrumenting, +Instrumenting for Edebug,, elisp, the Emacs Lisp Reference Manual}. @findex eval-region @findex eval-buffer - The most general command for evaluating Lisp expressions from a buffer -is @code{eval-region}. @kbd{M-x eval-region} parses the text of the -region as one or more Lisp expressions, evaluating them one by one. -@kbd{M-x eval-buffer} is similar but evaluates the entire -buffer. This is a reasonable way to install the contents of a file of -Lisp code that you are ready to test. Later, as you find bugs and -change individual functions, use @kbd{C-M-x} on each function that you -change. This keeps the Lisp world in step with the source file. + The command @kbd{M-x eval-region} parses the text of the region as +one or more Lisp expressions, evaluating them one by one. @kbd{M-x +eval-buffer} is similar but evaluates the entire buffer. @vindex eval-expression-print-level @vindex eval-expression-print-length @vindex eval-expression-debug-on-error - The two customizable variables @code{eval-expression-print-level} and -@code{eval-expression-print-length} control the maximum depth and length -of lists to print in the result of the evaluation commands before -abbreviating them. @code{eval-expression-debug-on-error} controls -whether evaluation errors invoke the debugger when these commands are -used; its default is @code{t}. + The customizable variables @code{eval-expression-print-level} and +@code{eval-expression-print-length} control the maximum depth and +length of lists to print in the result of the evaluation commands +before abbreviating them. @code{eval-expression-debug-on-error} +controls whether evaluation errors invoke the debugger when these +commands are used; its default is @code{t}. @node Lisp Interaction @section Lisp Interaction Buffers +@findex lisp-interaction-mode When Emacs starts up, it contains a buffer named @samp{*scratch*}, -which is provided for evaluating Lisp expressions interactively inside -Emacs. Its major mode is Lisp Interaction mode. +which is provided for evaluating Emacs Lisp expressions interactively. +Its major mode is Lisp Interaction mode. You can also enable Lisp +Interaction mode by typing @kbd{M-x lisp-interaction-mode}. @findex eval-print-last-sexp @kindex C-j @r{(Lisp Interaction mode)} - The simplest way to use the @samp{*scratch*} buffer is to insert -Lisp expressions and type @kbd{C-j} (@code{eval-print-last-sexp}) -after each expression. This command reads the Lisp expression before -point, evaluates it, and inserts the value in printed representation -before point. The result is a complete typescript of the expressions -you have evaluated and their values. + In the @samp{*scratch*} buffer, and other Lisp Interaction mode +buffers, @kbd{C-j} (@code{eval-print-last-sexp}) evaluates the Lisp +expression before point, and inserts the value at point. Thus, as you +type expressions into the buffer followed by @kbd{C-j} after each +expression, the buffer records a transcript of the evaluated +expressions and their values. All other commands in Lisp Interaction +mode are the same as in Emacs Lisp mode. @vindex initial-scratch-message At startup, the @samp{*scratch*} buffer contains a short message, in the form of a Lisp comment, that explains what it is for. This message is controlled by the variable @code{initial-scratch-message}, -which should be either a string or @code{nil}. If you set it to the -empty string, or @code{nil}, the initial message is suppressed. - -@findex lisp-interaction-mode - All other commands in Lisp Interaction mode are the same as in Emacs -Lisp mode. You can enable Lisp Interaction mode by typing @kbd{M-x -lisp-interaction-mode}. +which should be either a string, or @code{nil} (which means to +suppress the message). @findex ielm - An alternative way of evaluating Emacs Lisp expressions interactively -is to use Inferior Emacs-Lisp mode, which provides an interface rather -like Shell mode (@pxref{Shell Mode}) for evaluating Emacs Lisp -expressions. Type @kbd{M-x ielm} to create an @samp{*ielm*} buffer -which uses this mode. For more information see that command's -documentation. + An alternative way of evaluating Emacs Lisp expressions +interactively is to use Inferior Emacs Lisp mode, which provides an +interface rather like Shell mode (@pxref{Shell Mode}) for evaluating +Emacs Lisp expressions. Type @kbd{M-x ielm} to create an +@samp{*ielm*} buffer which uses this mode. For more information, see +that command's documentation. @node External Lisp @section Running an External Lisp +@cindex Lisp mode +@cindex mode, Lisp +@cindex Common Lisp - Emacs has facilities for running programs in other Lisp systems. You can -run a Lisp process as an inferior of Emacs, and pass expressions to it to -be evaluated. You can also pass changed function definitions directly from -the Emacs buffers in which you edit the Lisp programs to the inferior Lisp -process. + Lisp mode is the major mode for editing programs written in +general-purpose Lisp dialects, such as Common Lisp. Its mode command +is @kbd{M-x lisp-mode}. Emacs uses Lisp mode automatically for files +whose names end in @file{.l}, @file{.lsp}, or @file{.lisp}. @findex run-lisp @vindex inferior-lisp-program @kindex C-x C-z - To run an inferior Lisp process, type @kbd{M-x run-lisp}. This runs -the program named @code{lisp}, the same program you would run by typing -@code{lisp} as a shell command, with both input and output going through -an Emacs buffer named @samp{*lisp*}. That is to say, any ``terminal -output'' from Lisp will go into the buffer, advancing point, and any -``terminal input'' for Lisp comes from text in the buffer. (You can -change the name of the Lisp executable file by setting the variable -@code{inferior-lisp-program}.) - - To give input to Lisp, go to the end of the buffer and type the input, -terminated by @key{RET}. The @samp{*lisp*} buffer is in Inferior Lisp -mode, which combines the special characteristics of Lisp mode with most -of the features of Shell mode (@pxref{Shell Mode}). The definition of -@key{RET} to send a line to a subprocess is one of the features of Shell -mode. - -@findex lisp-mode - For the source files of programs to run in external Lisps, use Lisp -mode. You can switch to this mode with @kbd{M-x lisp-mode}, and it is -used automatically for files whose names end in @file{.l}, -@file{.lsp}, or @file{.lisp}. + You can run an external Lisp session as a subprocess or +@dfn{inferior process} of Emacs, and pass expressions to it to be +evaluated. To begin an external Lisp session, type @kbd{M-x +run-lisp}. This runs the program named @command{lisp}, and sets it up +so that both input and output go through an Emacs buffer named +@samp{*inferior-lisp*}. To change the name of the Lisp program run by +@kbd{M-x run-lisp}, change the variable @code{inferior-lisp-program}. + + The major mode for the @samp{*lisp*} buffer is Inferior Lisp mode, +which combines the characteristics of Lisp mode and Shell mode +(@pxref{Shell Mode}). To send input to the Lisp session, go to the +end of the @samp{*lisp*} buffer and type the input, followed by +@key{RET}. Terminal output from the Lisp session is automatically +inserted in the buffer. @kindex C-M-x @r{(Lisp mode)} @findex lisp-eval-defun - When you edit a function in a Lisp program you are running, the easiest -way to send the changed definition to the inferior Lisp process is the key -@kbd{C-M-x}. In Lisp mode, this runs the function @code{lisp-eval-defun}, -which finds the defun around or following point and sends it as input to -the Lisp process. (Emacs can send input to any inferior process regardless -of what buffer is current.) + When you edit a Lisp program in Lisp mode, you can type @kbd{C-M-x} +(@code{lisp-eval-defun}) to send an expression from the Lisp mode +buffer to a Lisp session that you had started with @kbd{M-x run-lisp}. +The expression sent is the top-level Lisp expression at or following +point. The resulting value goes as usual into the +@samp{*inferior-lisp*} buffer. Note that the effect of @kbd{C-M-x} in +Lisp mode is thus very similar to its effect in Emacs Lisp mode +(@pxref{Lisp Eval}), except that the expression is sent to a different +Lisp environment instead of being evaluated in Emacs. - Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing -programs to be run in another Lisp system) and Emacs-Lisp mode (for -editing Lisp programs to be run in Emacs; see @pxref{Lisp Eval}): in -both modes it has the effect of installing the function definition -that point is in, but the way of doing so is different according to -where the relevant Lisp environment is found. +@findex scheme-mode +@findex run-scheme +@cindex Scheme mode +@cindex mode, Scheme +@kindex C-M-x @r{(Scheme mode)} + The facilities for editing Scheme code, and for sending expressions +to a Scheme subprocess, are very similar. Scheme source files are +edited in Scheme mode, which can be explicitly enabled with @kbd{M-x +scheme-mode}. You can initiate a Scheme session by typing @kbd{M-x +run-scheme} (the buffer for interacting with Scheme is named +@samp{*scheme*}), and send expressions to it by typing @kbd{C-M-x}. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-12-10 07:39:43 +0000 +++ doc/emacs/emacs.texi 2011-12-12 07:25:58 +0000 @@ -699,7 +699,7 @@ * Executing Lisp:: Various modes for editing Lisp programs, with different facilities for running the Lisp programs. -* Lisp Libraries:: Creating Lisp programs to run in Emacs. +* Lisp Libraries:: How Lisp programs are loaded into Emacs. * Lisp Eval:: Executing a single Lisp expression in Emacs. * Lisp Interaction:: Executing Lisp in an Emacs buffer. * External Lisp:: Communicating through Emacs with a separate Lisp. === modified file 'etc/NEWS' --- etc/NEWS 2011-12-10 06:58:12 +0000 +++ etc/NEWS 2011-12-12 07:25:58 +0000 @@ -570,6 +570,7 @@ ** browse-url has a new variable `browse-url-mailto-function' specifies how mailto: URLs are handled. The default is `browse-url-mail'. +--- ** BibTeX mode *** BibTeX mode now supports biblatex. @@ -625,7 +626,7 @@ ** comint and modes derived from it use the generic completion code. ** Compilation mode - +--- *** Compilation mode can be used without font-lock-mode. `compilation-parse-errors-function' is now obsolete. ------------------------------------------------------------ revno: 106666 committer: Paul Eggert branch nick: trunk timestamp: Sun 2011-12-11 21:32:49 -0800 message: Spelling fixes. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-12-10 09:12:00 +0000 +++ doc/emacs/ChangeLog 2011-12-12 05:32:49 +0000 @@ -1676,7 +1676,7 @@ 2009-08-31 Nick Roberts * building.texi (Threads Buffer, Multithreaded Debugging): - Re-organise these two sections. + Reorganize these two sections. 2009-08-29 Eli Zaretskii === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-12-05 16:50:25 +0000 +++ doc/lispref/ChangeLog 2011-12-12 05:32:49 +0000 @@ -9754,7 +9754,7 @@ directory have been changed to reflect this. * All instances of @indentedresultt{} have been changed to - ` @result{}', using 5 spaces at the begining of the line. + ` @result{}', using 5 spaces at the beginning of the line. 1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu) === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2011-10-18 01:42:28 +0000 +++ doc/lispref/elisp.texi 2011-12-12 05:32:49 +0000 @@ -1381,7 +1381,7 @@ * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1438,7 +1438,7 @@ GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. === modified file 'doc/lispref/internals.texi' --- doc/lispref/internals.texi 2011-11-15 07:55:13 +0000 +++ doc/lispref/internals.texi 2011-12-12 05:32:49 +0000 @@ -13,7 +13,7 @@ @menu * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. @@ -196,7 +196,7 @@ function definition is copied into pure storage. This flag is @code{t} while loading all of the basic functions for -building Emacs initially (allowing those functions to be sharable and +building Emacs initially (allowing those functions to be shareable and non-collectible). Dumping Emacs as an executable always writes @code{nil} in this variable, regardless of the value it actually has before and after dumping. === modified file 'doc/lispref/nonascii.texi' --- doc/lispref/nonascii.texi 2011-08-23 14:45:14 +0000 +++ doc/lispref/nonascii.texi 2011-12-12 05:32:49 +0000 @@ -1580,7 +1580,7 @@ Sometimes, you need to prefer several coding systems for some operation, rather than fix a single one. Emacs lets you specify a priority order for using coding systems. This ordering affects the -sorting of lists of coding sysems returned by functions such as +sorting of lists of coding systems returned by functions such as @code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}). @defun coding-system-priority-list &optional highestp === modified file 'doc/lispref/vol1.texi' --- doc/lispref/vol1.texi 2011-10-18 01:42:28 +0000 +++ doc/lispref/vol1.texi 2011-12-12 05:32:49 +0000 @@ -44,7 +44,7 @@ @end ifset @c per rms and peterb, use 10pt fonts for the main text, mostly to -@c save on paper cost. +@c save on paper cost. @c Do this inside @tex for now, so current makeinfo does not complain. @tex @ifset smallbook @@ -1402,7 +1402,7 @@ * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1458,7 +1458,7 @@ GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. === modified file 'doc/lispref/vol2.texi' --- doc/lispref/vol2.texi 2011-10-18 01:42:28 +0000 +++ doc/lispref/vol2.texi 2011-12-12 05:32:49 +0000 @@ -1401,7 +1401,7 @@ * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1457,7 +1457,7 @@ GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2011-12-04 08:02:42 +0000 +++ doc/misc/calc.texi 2011-12-12 05:32:49 +0000 @@ -16873,7 +16873,7 @@ converts a date form into a Unix time value, which is the number of seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result will be an integer if the current precision is 12 or less; for higher -precisions, the result may be a float with (@var{precision}@minus{}12) +precision, the result may be a float with (@var{precision}@minus{}12) digits after the decimal. Just as for @kbd{t J}, the numeric time is interpreted in the GMT time zone and the date form is interpreted in the current or specified zone. Some systems use Unix-like @@ -16943,7 +16943,7 @@ The @kbd{M-6 t P} [@code{second}] function extracts the second from a date form. If the current precision is 12 or less, the result is an integer in the range 0 to 59. For higher -precisions, the result may instead be a floating-point number. +precision, the result may instead be a floating-point number. @tindex weekday The @kbd{M-7 t P} [@code{weekday}] function extracts the weekday @@ -18499,7 +18499,7 @@ Calc can compute a variety of less common functions that arise in various branches of mathematics. All of the functions described in this section allow arbitrary complex arguments and, except as noted, -will work to arbitrarily large precisions. They can not at present +will work to arbitrarily large precision. They can not at present handle error forms or intervals as arguments. NOTE: These functions are still experimental. In particular, their === modified file 'doc/misc/cc-mode.texi' --- doc/misc/cc-mode.texi 2011-11-20 07:30:16 +0000 +++ doc/misc/cc-mode.texi 2011-12-12 05:32:49 +0000 @@ -2160,7 +2160,7 @@ a user function. The last character of the function name and the opening parenthesis are highlighted. This font-locking rule will spuriously highlight a valid concatenation expression where an -identifier precedes a parenthesised expression. Unfortunately. +identifier precedes a parenthesized expression. Unfortunately. @item Whitespace following the @samp{\} in what otherwise looks like an === modified file 'doc/misc/dbus.texi' --- doc/misc/dbus.texi 2011-11-19 09:18:31 +0000 +++ doc/misc/dbus.texi 2011-12-12 05:32:49 +0000 @@ -1816,7 +1816,7 @@ @defvar dbus-event-error-hooks This hook variable keeps a list of functions, which are called when a D-Bus error happens in the event handler. Every function must accept -two arguments, the event and the error variable catched in +two arguments, the event and the error variable caught in @code{condition-case} by @code{dbus-error}. Such functions can be used the adapt the error signal to be raised. === modified file 'doc/misc/ebrowse.texi' --- doc/misc/ebrowse.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/ebrowse.texi 2011-12-12 05:32:49 +0000 @@ -482,7 +482,7 @@ @table @kbd @item SPC This command views the class declaration if the database -contains informations about it. If you don't parse the entire source +contains information about it. If you don't parse the entire source you are working on, some classes will only be known to exist but the location of their declarations and definitions will not be known.@refill === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2011-11-15 07:55:13 +0000 +++ doc/misc/emacs-mime.texi 2011-12-12 05:32:49 +0000 @@ -417,7 +417,7 @@ @vindex mm-inline-text-html-with-images Some @acronym{HTML} mails might have the trick of spammers using @samp{} tags. It is likely to be intended to verify whether you -have read the mail. You can prevent your personal informations from +have read the mail. You can prevent your personal information from leaking by setting this option to @code{nil} (which is the default). It is currently ignored by Emacs/w3. For emacs-w3m, you may use the command @kbd{t} on the image anchor to show an image even if it is === modified file 'doc/misc/gnus-faq.texi' --- doc/misc/gnus-faq.texi 2011-12-06 01:30:54 +0000 +++ doc/misc/gnus-faq.texi 2011-12-12 05:32:49 +0000 @@ -1838,7 +1838,7 @@ in Gnus. Here comes nnir into action. Nnir is a front end to search engines like swish-e or swish++ and others. You index your mail with one of those search -engines and with the help of nnir you can search trough +engines and with the help of nnir you can search through the indexed mail and generate a temporary group with all messages which met your search criteria. If this sound cool to you get nnir.el from === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-12-05 08:55:25 +0000 +++ doc/misc/gnus.texi 2011-12-12 05:32:49 +0000 @@ -4622,7 +4622,7 @@ the @code{sieve} group parameter (@pxref{Group Parameters}) to specify sieve rules that should apply to each group. Gnus provides two commands to translate all these group parameters into a proper Sieve -script that can be transfered to the server somehow. +script that can be transferred to the server somehow. @vindex gnus-sieve-file @vindex gnus-sieve-region-start @@ -8332,7 +8332,7 @@ Files with a @acronym{MIME} type matching this variable won't be viewed. Note that Gnus tries to guess what type the file is based on the name. @code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly -kludgey. +kludgy. @item gnus-uu-tmp-dir @vindex gnus-uu-tmp-dir === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2011-12-04 08:02:42 +0000 +++ doc/misc/tramp.texi 2011-12-12 05:32:49 +0000 @@ -528,8 +528,8 @@ @cindex methods, inline @cindex methods, external Loading or saving a remote file requires that the content of the file -be transfered between the two machines. The content of the file can -be transfered using one of two methods: the @dfn{inline method} over +be transferred between the two machines. The content of the file can +be transferred using one of two methods: the @dfn{inline method} over the same connection used to log in to the remote machine, or the @dfn{external method} through another connection using a remote copy program such as @command{rcp}, @command{scp} or @command{rsync}. === modified file 'etc/srecode/el.srt' --- etc/srecode/el.srt 2011-03-06 02:43:19 +0000 +++ etc/srecode/el.srt 2011-12-12 05:32:49 +0000 @@ -109,7 +109,7 @@ '($MODESYM$-mode-font-lock-keywords nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w")))) (run-hooks '$MODESYM$-mode-hook) === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-12-04 17:13:01 +0000 +++ lib-src/ChangeLog 2011-12-12 05:32:49 +0000 @@ -3137,7 +3137,7 @@ (main): Call put_entries here even in CTAGS mode. (main, process_file): Check the return values of fclose and pclose. (process_file): Do not call put_entries after parsing each file. - (process_file): Canonicalise file names even for ctags. + (process_file): Canonicalize file names even for ctags. (process_file): Set curfile here... (find_entries): ... not here any more. (add_node): In etags mode, build a linked list of entries (on === modified file 'lisp/ChangeLog.13' --- lisp/ChangeLog.13 2011-12-05 08:55:25 +0000 +++ lisp/ChangeLog.13 2011-12-12 05:32:49 +0000 @@ -7261,7 +7261,7 @@ * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin) (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint) - (gdb-goto-breakpoint): Generalise for breakpoints with multiple + (gdb-goto-breakpoint): Generalize for breakpoints with multiple locations. (gdb-info-breakpoints-custom, gdb-assembler-custom) (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp. === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2011-12-04 08:02:42 +0000 +++ lisp/ChangeLog.15 2011-12-12 05:32:49 +0000 @@ -8618,7 +8618,7 @@ (menu-bar-showhide-tool-bar-menu-customize-enable-right) (menu-bar-showhide-tool-bar-menu-customize-enable-bottom) (menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions - (menu-bar-showhide-tool-bar-menu): If tool bar is moveable, + (menu-bar-showhide-tool-bar-menu): If tool bar is movable, make a menu for Options => toolbar that can move it. 2010-07-29 Chong Yidong === modified file 'lisp/ChangeLog.3' --- lisp/ChangeLog.3 2011-12-04 08:02:42 +0000 +++ lisp/ChangeLog.3 2011-12-12 05:32:49 +0000 @@ -8647,7 +8647,7 @@ * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's version 2.0 comint offerings. * ring.el: The underlying history mechanism for comint. - Generalised handling of a ring data type based on vectors. + Generalized handling of a ring data type based on vectors. * history.el: For now, a symlink to ring.el. * loaddefs.el: Updated shell-prompt-pattern doc string. === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2011-12-06 01:30:54 +0000 +++ lisp/ChangeLog.7 2011-12-12 05:32:49 +0000 @@ -13088,7 +13088,7 @@ 1997-07-25 Simon Marshall - * complete.el: Customise; as subgroup of minibuffer. + * complete.el: Customize; as subgroup of minibuffer. (partial-completion-mode): New option to toggle mode. (partial-completion-mode): New command to toggle mode. Add and remove hooks here, i.e., not at the top-level. @@ -13617,7 +13617,7 @@ 1997-07-15 Simon Marshall - * mouse-sel.el: Customise; create mouse-sel as subgroup of mouse. + * mouse-sel.el: Customize; create mouse-sel as subgroup of mouse. (mouse-sel-mode): New option to toggle mode. (mouse-sel-mode): New command to toggle mode. (mouse-sel-set-selection-function): If mouse-sel-default-bindings is @@ -13625,7 +13625,7 @@ (mouse-sel-bindings): New function to install/restore mouse bindings. This is called by mouse-sel-mode, i.e., not at the top-level. - * delsel.el: Customise; as part of editing-basics group. + * delsel.el: Customize; as part of editing-basics group. (delete-selection-mode): Convert to autoloaded option. Default to nil. (delete-selection-mode): Define before option. Modify pre-command-hook here, i.e., not at the top-level. @@ -14943,7 +14943,7 @@ paren-matching) and put all blink-matching-paren variables in the former (as opposed to the latter) group. - * paren.el: Customise; paren-showing as a subgroup of paren-matching. + * paren.el: Customize; paren-showing as a subgroup of paren-matching. (show-paren-style): New variable. (show-paren-match-face) (show-paren-mismatch-face): New faces. @@ -18871,7 +18871,7 @@ 1997-04-16 Simon Marshall - * font-lock.el: Customise. + * font-lock.el: Customize. (font-lock-defaults-alist): Leave ~ syntax alone in C++. (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~ characters here. @@ -18883,10 +18883,10 @@ (font-lock-compile-keywords): Don't set font-lock-keywords. (font-lock-fontify-keywords-region): Set it here. - * fast-lock.el: Customise. + * fast-lock.el: Customize. (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords. - * lazy-lock.el: Customise. + * lazy-lock.el: Customize. (lazy-lock-fontify-conservatively): Fontify around WINDOW's point. * shell.el (shell-font-lock-keywords): Use EVAL form for prompt. === modified file 'lisp/calc/calc-poly.el' --- lisp/calc/calc-poly.el 2011-11-20 02:29:42 +0000 +++ lisp/calc/calc-poly.el 2011-12-12 05:32:49 +0000 @@ -147,7 +147,7 @@ ;;; Return only quotient to top of stack (nil if zero) -;; calc-poly-div-remainder is a local variable for +;; calc-poly-div-remainder is a local variable for ;; calc-poly-div (in calc-alg.el), but is used by ;; calcFunc-pdiv, which is called by calc-poly-div. (defvar calc-poly-div-remainder) @@ -512,7 +512,7 @@ ;;; Given an expression find all variables that are polynomial bases. ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ). -;; The variable math-poly-base-total-base is local to +;; The variable math-poly-base-total-base is local to ;; math-total-polynomial-base, but is used by math-polynomial-p1, ;; which is called by math-total-polynomial-base. (defvar math-poly-base-total-base) @@ -539,19 +539,19 @@ nil) ;; The variable math-factored-vars is local to calcFunc-factors and -;; calcFunc-factor, but is used by math-factor-expr and +;; calcFunc-factor, but is used by math-factor-expr and ;; math-factor-expr-part, which are called (directly and indirectly) by ;; calcFunc-factor and calcFunc-factors. (defvar math-factored-vars) ;; The variable math-fact-expr is local to calcFunc-factors, -;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try +;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try ;; and math-factor-expr-part, which are called (directly and indirectly) by ;; calcFunc-factor, calcFunc-factors and math-factor-expr. (defvar math-fact-expr) -;; The variable math-to-list is local to calcFunc-factors and -;; calcFunc-factor, but is used by math-accum-factors, which is +;; The variable math-to-list is local to calcFunc-factors and +;; calcFunc-factor, but is used by math-accum-factors, which is ;; called (indirectly) by calcFunc-factors and calcFunc-factor. (defvar math-to-list) @@ -729,7 +729,7 @@ '(1))) ;; We now have a square-free polynomial with integer coefs. - ;; For now, we use a kludgey method that finds linear and + ;; For now, we use a kludgy method that finds linear and ;; quadratic terms using floating-point root-finding. (if (setq t1 (let ((calc-symbolic-mode nil)) (math-poly-all-roots nil p t))) @@ -749,7 +749,7 @@ (math-add (math-add (math-mul den (math-pow math-fet-x 2)) - (math-mul (math-mul coef1 den) + (math-mul (math-mul coef1 den) math-fet-x)) (math-mul coef0 den))) (let ((den (math-lcm-denoms coef0))) @@ -1077,7 +1077,7 @@ ((and (eq (car-safe expr) '^) (memq (car-safe (nth 1 expr)) '(+ -)) (integerp (nth 2 expr)) - (if (and + (if (and (or (math-known-matrixp (nth 1 (nth 1 expr))) (math-known-matrixp (nth 2 (nth 1 expr))) (and @@ -1090,11 +1090,11 @@ (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr)) (list '* (nth 2 (nth 1 expr)) (nth 1 expr)) nil (eq (car (nth 1 expr)) '-)) - (math-add-or-sub (list '* (nth 1 (nth 1 expr)) - (list '^ (nth 1 expr) + (math-add-or-sub (list '* (nth 1 (nth 1 expr)) + (list '^ (nth 1 expr) (1- (nth 2 expr)))) - (list '* (nth 2 (nth 1 expr)) - (list '^ (nth 1 expr) + (list '* (nth 2 (nth 1 expr)) + (list '^ (nth 1 expr) (1- (nth 2 expr)))) nil (eq (car (nth 1 expr)) '-))) (if (> (nth 2 expr) 0) === modified file 'lisp/cedet/semantic/bovine/el.el' --- lisp/cedet/semantic/bovine/el.el 2011-11-20 02:29:42 +0000 +++ lisp/cedet/semantic/bovine/el.el 2011-12-12 05:32:49 +0000 @@ -497,15 +497,15 @@ Unfortunately, this requires that the tag in question has been loaded into Emacs Lisp's memory." (let ((obsoletethis (intern-soft (semantic-tag-name tag))) - (obsoletor nil)) + (obsoleter nil)) ;; This asks if our tag is available in the Emacs name space for querying. (when obsoletethis (mapatoms (lambda (a) (let ((oi (get a 'byte-obsolete-info))) (if (and oi (eq (car oi) obsoletethis)) - (setq obsoletor a))))) - (if obsoletor - (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag)) + (setq obsoleter a))))) + (if obsoleter + (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag)) "")))) (define-mode-local-override semantic-documentation-for-tag === modified file 'lisp/cedet/semantic/find.el' --- lisp/cedet/semantic/find.el 2011-11-15 07:55:13 +0000 +++ lisp/cedet/semantic/find.el 2011-12-12 05:32:49 +0000 @@ -427,7 +427,7 @@ ;;; Old Style Brute Force Search Routines ;; -;; These functions will search through tags lists explicity for +;; These functions will search through tags lists explicitly for ;; desired information. ;; The -by-name nonterminal search can use the built in fcn === modified file 'lisp/cedet/semantic/grammar.el' --- lisp/cedet/semantic/grammar.el 2011-11-25 07:14:48 +0000 +++ lisp/cedet/semantic/grammar.el 2011-12-12 05:32:49 +0000 @@ -1290,7 +1290,7 @@ semantic-grammar-mode-keywords-3) nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w")))) ;; Setup Semantic to parse grammar === modified file 'lisp/cedet/semantic/wisent/comp.el' --- lisp/cedet/semantic/wisent/comp.el 2011-04-01 15:16:50 +0000 +++ lisp/cedet/semantic/wisent/comp.el 2011-12-12 05:32:49 +0000 @@ -2640,7 +2640,7 @@ (defun wisent-print-results () "Print information on generated parser. -Report detailed informations if `wisent-verbose-flag' or +Report detailed information if `wisent-verbose-flag' or `wisent-debug-flag' are non-nil." (when (or wisent-verbose-flag wisent-debug-flag) (wisent-print-useless)) === modified file 'lisp/cedet/srecode/srt-mode.el' --- lisp/cedet/srecode/srt-mode.el 2011-11-14 06:27:12 +0000 +++ lisp/cedet/srecode/srt-mode.el 2011-12-12 05:32:49 +0000 @@ -194,7 +194,7 @@ '(srecode-font-lock-keywords nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w"))))) === modified file 'lisp/comint.el' --- lisp/comint.el 2011-11-20 07:30:16 +0000 +++ lisp/comint.el 2011-12-12 05:32:49 +0000 @@ -45,7 +45,7 @@ ;; It is pretty easy to make new derived modes for other processes. ;; For documentation on the functionality provided by Comint mode, and -;; the hooks available for customising it, see the comments below. +;; the hooks available for customizing it, see the comments below. ;; For further information on the standard derived modes (shell, ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. === modified file 'lisp/delim-col.el' --- lisp/delim-col.el 2011-12-04 08:02:42 +0000 +++ lisp/delim-col.el 2011-12-12 05:32:49 +0000 @@ -97,7 +97,7 @@ ;; operates over the text rectangle selected which rectangle diagonal is ;; given by the region start and end. ;; -;; See `delimit-columns-format' variable documentation for column formating. +;; See `delimit-columns-format' variable documentation for column formatting. ;; ;; `delimit-columns-region' is useful when you have columns of text that ;; are not well aligned, like: @@ -171,7 +171,7 @@ Valid values are: - nil no formating. That is, `delimit-columns-after' is followed by + nil no formatting. That is, `delimit-columns-after' is followed by `delimit-columns-separator'. For example, the result is: \"::\" @@ -190,9 +190,9 @@ For example, the result is: \"::\" Any other value is treated as t." - :type '(choice :menu-tag "Column Formating" - :tag "Column Formating" - (const :tag "No Formating" nil) + :type '(choice :menu-tag "Column Formatting" + :tag "Column Formatting" + (const :tag "No Formatting" nil) (const :tag "Column Alignment" t) (const :tag "Separator Alignment" separator) (const :tag "Column Padding" padding)) @@ -404,7 +404,7 @@ (re-search-forward delimit-columns-separator delimit-columns-limit 'move)) (setq ncol (1+ ncol))) - ;; insert first formating + ;; insert first formatting (insert delimit-columns-str-before delimit-columns-before) ;; Adjust all columns but last one (while (progn @@ -436,7 +436,7 @@ (setq spaces (and delimit-columns-format (make-string (aref delimit-columns-max ncol) ?\s))))) - ;; insert last formating + ;; insert last formatting (cond ((null delimit-columns-format) (insert delimit-columns-after delimit-columns-str-after)) ((eq delimit-columns-format 'padding) === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2011-12-04 08:02:42 +0000 +++ lisp/emulation/cua-base.el 2011-12-12 05:32:49 +0000 @@ -368,7 +368,7 @@ (defcustom cua-check-pending-input t "If non-nil, don't override prefix key if input pending. -It is rumoured that `input-pending-p' is unreliable under some window +It is rumored that `input-pending-p' is unreliable under some window managers, so try setting this to nil, if prefix override doesn't work." :type 'boolean :group 'cua) === modified file 'lisp/epa-dired.el' --- lisp/epa-dired.el 2011-04-04 06:16:23 +0000 +++ lisp/epa-dired.el 2011-12-12 05:32:49 +0000 @@ -67,7 +67,7 @@ (while file-list (epa-encrypt-file (expand-file-name (car file-list)) - (epa-select-keys (epg-make-context) "Select recipents for encryption. + (epa-select-keys (epg-make-context) "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. ")) (setq file-list (cdr file-list))) (revert-buffer))) === modified file 'lisp/epa-file.el' --- lisp/epa-file.el 2011-08-12 13:49:45 +0000 +++ lisp/epa-file.el 2011-12-12 05:32:49 +0000 @@ -235,7 +235,7 @@ (current-buffer))))) (epa-select-keys context - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " recipients) (if epa-file-encrypt-to @@ -273,7 +273,7 @@ (epg-sub-key-id (car (epg-key-sub-key-list key)))) (epa-select-keys (epg-make-context) - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. ")))) ;;;###autoload === modified file 'lisp/erc/ChangeLog.03' --- lisp/erc/ChangeLog.03 2011-12-09 03:12:38 +0000 +++ lisp/erc/ChangeLog.03 2011-12-12 05:32:49 +0000 @@ -416,7 +416,7 @@ * erc-button.el 1.47: New variable erc-button-wrap-long-urls. Modified erc-button-add-buttons: New optional argument REGEXP. - If we're buttonising a URL and erc-button-wrap-long-urls is + If we're buttonizing a URL and erc-button-wrap-long-urls is non-nil, try and wrap them Modified erc-button-add-buttons-1: @@ -822,7 +822,7 @@ (define-erc-module): the enable and disable routines now update erc-modules accordingly erc-modules: new variable controlling the modules which erc has loaded/will - load. when customising, it will automatically enable modules. it won't + load. when customizing, it will automatically enable modules. it won't automatically disable modules which are removed, yet. (erc-update-modules): enable all modules in `erc-modules' @@ -1058,7 +1058,7 @@ * erc.el 1.483 (erc-process-input-line): when displaying the help for a function, if no documentation exists, don't fall over - (erc-cmd-SAY): new function for quoting lines begining with / + (erc-cmd-SAY): new function for quoting lines beginning with / (erc-server-NICK): - fix a bug where the "is now known as" message doesn't appear on newly created /query buffers @@ -1491,7 +1491,7 @@ * erc.el 1.438: * removed duplicate do-no-parse-args properties for the defaliased defuns (erc-process-input-line): show function signature when incorrect args - (erc-extract-command-from-line): canonicalise defaliases before extracting + (erc-extract-command-from-line): canonicalize defaliases before extracting plist (erc-cmd-CLEAR): fixed (erc-cmd-UNIGNORE): fixed again === modified file 'lisp/eshell/em-dirs.el' --- lisp/eshell/em-dirs.el 2011-03-05 04:11:05 +0000 +++ lisp/eshell/em-dirs.el 2011-12-12 05:32:49 +0000 @@ -160,7 +160,7 @@ directories gets pushed, and its size is unlimited. `eshell-last-dir-ring' is meant for users who don't use `pushd' -explicity very much, but every once in a while would like to return to +explicitly very much, but every once in a while would like to return to a previously visited directory without having to type in the whole thing again." :type 'integer === modified file 'lisp/forms.el' --- lisp/forms.el 2011-11-20 02:29:42 +0000 +++ lisp/forms.el 2011-12-12 05:32:49 +0000 @@ -709,7 +709,7 @@ (forms-first-record)) ) - ;; user customising + ;; user customizing ;;(message "forms: proceeding setup (user hooks)...") (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks) ;;(message "forms: setting up... done.") === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-11 17:08:11 +0000 +++ lisp/gnus/ChangeLog 2011-12-12 05:32:49 +0000 @@ -3595,7 +3595,7 @@ (autoload): Silence byte-compiler. (nnir-open-server): Add a hook for nnir groups. (nnir-request-move-article): Don't mangle the header. Better to use - formating variables (which will be added in the future). + formatting variables (which will be added in the future). (nnir-registry-action): Update the registry using the original article group name. (nnir-mode): Install nnir-specific hooks for updating the registry. @@ -21851,7 +21851,7 @@ 2004-01-06 Steve Youngs - * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on + * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on XEmacs version. * dns.el (dns-make-network-process): Use `open-network-stream' === modified file 'lisp/gnus/plstore.el' --- lisp/gnus/plstore.el 2011-09-27 06:01:27 +0000 +++ lisp/gnus/plstore.el 2011-12-12 05:32:49 +0000 @@ -420,7 +420,7 @@ (current-buffer))))) (epa-select-keys context - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " recipients) (if plstore-encrypt-to === modified file 'lisp/ibuf-ext.el' --- lisp/ibuf-ext.el 2011-10-19 12:54:24 +0000 +++ lisp/ibuf-ext.el 2011-12-12 05:32:49 +0000 @@ -26,7 +26,7 @@ ;;; Commentary: ;; These functions should be automatically loaded when called, but you -;; can explicity (require 'ibuf-ext) in your ~/.emacs to have them +;; can explicitly (require 'ibuf-ext) in your ~/.emacs to have them ;; preloaded. ;;; Code: === modified file 'lisp/international/mule-util.el' --- lisp/international/mule-util.el 2011-02-04 10:45:46 +0000 +++ lisp/international/mule-util.el 2011-12-12 05:32:49 +0000 @@ -314,7 +314,7 @@ (defmacro with-coding-priority (coding-systems &rest body) "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list. CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'. -This affects the implicit sorting of lists of coding sysems returned by +This affects the implicit sorting of lists of coding systems returned by operations such as `find-coding-systems-region'." (let ((current (make-symbol "current"))) `(let ((,current (coding-system-priority-list))) === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2011-09-23 23:47:27 +0000 +++ lisp/mail/emacsbug.el 2011-12-12 05:32:49 +0000 @@ -437,7 +437,7 @@ (car bug)) items)) (nreverse items)))) - (widget-insert "No bugs maching your keywords found.\n")) + (widget-insert "No bugs matching your keywords found.\n")) (widget-insert "\n") (widget-create 'push-button :notify (lambda (&rest ignore) === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2011-12-04 08:02:42 +0000 +++ lisp/net/ange-ftp.el 2011-12-12 05:32:49 +0000 @@ -2854,7 +2854,7 @@ ;; that a wasted listing is not done: ;; 1. When looking for a .dired file in dired-x.el. ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid -;; subdirectory. This is of course an OS dependent judgement. +;; subdirectory. This is of course an OS dependent judgment. (defvar dired-local-variables-file) (defmacro ange-ftp-allow-child-lookup (dir file) === modified file 'lisp/net/dbus.el' --- lisp/net/dbus.el 2011-11-26 08:26:37 +0000 +++ lisp/net/dbus.el 2011-12-12 05:32:49 +0000 @@ -101,7 +101,7 @@ (defvar dbus-event-error-hooks nil "Functions to be called when a D-Bus error happens in the event handler. Every function must accept two arguments, the event and the error variable -catched in `condition-case' by `dbus-error'.") +caught in `condition-case' by `dbus-error'.") ;;; Hash table of registered functions. === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2011-12-02 19:23:19 +0000 +++ lisp/net/tramp-sh.el 2011-12-12 05:32:49 +0000 @@ -44,7 +44,7 @@ (defcustom tramp-inline-compress-start-size 4096 "*The minimum size of compressing where inline transfer. -When inline transfer, compress transfered data of file +When inline transfer, compress transferred data of file whose size is this value or above (up to `tramp-copy-size-limit'). If it is nil, no compression at all will be applied." :group 'tramp @@ -3726,7 +3726,7 @@ ;; Check whether the output of "uname -sr" has been changed. If ;; yes, this is a strong indication that we must expire all ;; connection properties. We start again with - ;; `tramp-maybe-open-connection', it will be catched there. + ;; `tramp-maybe-open-connection', it will be caught there. (tramp-message vec 5 "Checking system information") (let ((old-uname (tramp-get-connection-property vec "uname" nil)) (new-uname @@ -4215,7 +4215,7 @@ (tramp-send-command vec "echo are you awake" t t) (unless (and (memq (process-status p) '(run open)) (tramp-wait-for-output p 10)) - ;; The error will be catched locally. + ;; The error will be caught locally. (tramp-error vec 'file-error "Awake did fail"))) (file-error (tramp-flush-connection-property vec) === modified file 'lisp/net/xesam.el' --- lisp/net/xesam.el 2011-12-05 08:55:25 +0000 +++ lisp/net/xesam.el 2011-12-12 05:32:49 +0000 @@ -172,7 +172,7 @@ (defface xesam-highlight '((t :inherit match)) "Face to highlight query entries. -It will be overlayed by `widget-documentation-face', so it shall +It will be overlaid by `widget-documentation-face', so it shall be different at least in one face property not set in that face." :group 'xesam) === modified file 'lisp/obsolete/old-whitespace.el' --- lisp/obsolete/old-whitespace.el 2011-04-20 17:18:34 +0000 +++ lisp/obsolete/old-whitespace.el 2011-12-12 05:32:49 +0000 @@ -515,12 +515,12 @@ (whitespace-check-whitespace-mode current-prefix-arg) (if (and buffer-file-name whitespace-mode) (let ((whitespace-any nil) - (whitespace-tabwith 8) - (whitespace-tabwith-saved tab-width)) + (whitespace-tabwidth 8) + (whitespace-tabwidth-saved tab-width)) ;; since all printable TABS should be 8, irrespective of how ;; they are displayed. - (setq tab-width whitespace-tabwith) + (setq tab-width whitespace-tabwidth) (if (and whitespace-check-buffer-leading (whitespace-buffer-leading)) @@ -562,7 +562,7 @@ (message "The region is now clean") (message "%s is now clean" buffer-file-name))) (whitespace-update-modeline))) - (setq tab-width whitespace-tabwith-saved)))) + (setq tab-width whitespace-tabwidth-saved)))) ;;;###autoload (defun whitespace-cleanup-region (s e) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-12-06 01:30:54 +0000 +++ lisp/org/ChangeLog 2011-12-12 05:32:49 +0000 @@ -7124,7 +7124,7 @@ 2010-11-11 Dan Davison * ob.el (org-babel-get-src-block-info): Form info list correctly - when parenthesised arguments are missing. + when parenthesized arguments are missing. 2010-11-11 Dan Davison === modified file 'lisp/org/org.el' --- lisp/org/org.el 2011-11-20 19:35:27 +0000 +++ lisp/org/org.el 2011-12-12 05:32:49 +0000 @@ -2580,7 +2580,7 @@ (defcustom org-time-stamp-custom-formats '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american "Custom formats for time stamps. See `format-time-string' for the syntax. -These are overlayed over the default ISO format if the variable +These are overlaid over the default ISO format if the variable `org-display-custom-times' is set. Time like %H:%M should be at the end of the second format. The custom formats are also honored by export commands, if custom time display is turned on at the time of export." @@ -15109,7 +15109,7 @@ (org-restart-font-lock) (setq org-table-may-need-update t) (if org-display-custom-times - (message "Time stamps are overlayed with custom format") + (message "Time stamps are overlaid with custom format") (message "Time stamp overlays removed"))) (defun org-display-custom-time (beg end) @@ -18961,7 +18961,7 @@ :target on a <> :radio-target on a <<>> :latex-fragment on a LaTeX fragment -:latex-preview on a LaTeX fragment with overlayed preview image +:latex-preview on a LaTeX fragment with overlaid preview image This function expects the position to be visible because it uses font-lock faces as a help to recognize the following contexts: :table-special, :link, === modified file 'lisp/proced.el' --- lisp/proced.el 2011-08-24 18:09:18 +0000 +++ lisp/proced.el 2011-12-12 05:32:49 +0000 @@ -1332,7 +1332,7 @@ (proced-sort-interactive key arg) (message "No sorter defined here.")))))) -;;; Formating +;;; Formatting (defun proced-format-time (time) "Format time interval TIME." === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2011-11-27 04:43:11 +0000 +++ lisp/progmodes/ada-mode.el 2011-12-12 05:32:49 +0000 @@ -499,7 +499,7 @@ (defvar ada-case-exception-substring '() "Alist of substrings (entities) that have special casing. -The substrings are detected for word constituant when the word +The substrings are detected for word constituent when the word is not itself in `ada-case-exception', and only for substrings that either are at the beginning or end of the word, or start after '_'.") @@ -1773,7 +1773,7 @@ ;; `ada-insert-paramlist'. ;; Both steps are called from `ada-format-paramlist'. ;; Note: Comments inside the parameter list are lost. -;; The syntax has to be correct, or the reformating will fail. +;; The syntax has to be correct, or the reformatting will fail. ;;-------------------------------------------------------------- (defun ada-format-paramlist () @@ -2139,7 +2139,7 @@ (while command-line-args-left (let ((source (car command-line-args-left))) - (message "Formating %s" source) + (message "Formatting %s" source) (find-file source) (ada-indent-region (point-min) (point-max)) (ada-adjust-case-buffer) === modified file 'lisp/progmodes/ada-xref.el' --- lisp/progmodes/ada-xref.el 2011-11-26 08:26:37 +0000 +++ lisp/progmodes/ada-xref.el 2011-12-12 05:32:49 +0000 @@ -30,7 +30,7 @@ ;;; for lookup and completion in Ada mode. ;;; ;;; If a file *.`adp' exists in the ada-file directory, then it is -;;; read for configuration informations. It is read only the first +;;; read for configuration information. It is read only the first ;;; time a cross-reference is asked for, and is not read later. ;;; You need Emacs >= 20.2 to run this package === modified file 'lisp/progmodes/cc-awk.el' --- lisp/progmodes/cc-awk.el 2011-11-20 02:29:42 +0000 +++ lisp/progmodes/cc-awk.el 2011-12-12 05:32:49 +0000 @@ -545,7 +545,7 @@ (defun c-awk-vsemi-status-unknown-p () ;; Are we unsure whether there is a virtual semicolon on the current line? ;; DO NOT under any circumstances attempt to calculate this; that would - ;; defeat the (admittedly kludgey) purpose of this function, which is to + ;; defeat the (admittedly kludgy) purpose of this function, which is to ;; prevent an infinite recursion in c-beginning-of-statement-1 when point ;; starts at a `while' token. (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2011-12-04 08:02:42 +0000 +++ lisp/progmodes/cc-cmds.el 2011-12-12 05:32:49 +0000 @@ -1360,7 +1360,7 @@ ;; Determine where we are with respect to functions (or other brace ;; constructs, included in the term "function" in the rest of this comment). ;; Point is assumed to be outside any macro or literal. - ;; This is used by c-\(begining\|end\)-of-defun. + ;; This is used by c-\(beginning\|end\)-of-defun. ;; ;; Return one of these symbols: ;; at-header : we're at the start of a function's header. === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2011-12-05 08:55:25 +0000 +++ lisp/progmodes/cc-engine.el 2011-12-12 05:32:49 +0000 @@ -2113,7 +2113,7 @@ ;; buffer). Otherwise, return nil. ;; ;; This function is almost the same as `c-literal-limits'. It differs in - ;; that it is a lower level function, and that it rigourously follows the + ;; that it is a lower level function, and that it rigorously follows the ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position. ;; ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2011-12-06 02:22:48 +0000 +++ lisp/progmodes/cc-fonts.el 2011-12-12 05:32:49 +0000 @@ -1211,7 +1211,7 @@ ;; o - '<> if the arglist is of angle bracket type; ;; o - 'arglist if it's some other arglist; ;; o - nil, if not in an arglist at all. This includes the - ;; parenthesised condition which follows "if", "while", etc. + ;; parenthesized condition which follows "if", "while", etc. context ;; The position of the next token after the closing paren of ;; the last detected cast. === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2011-11-27 04:43:11 +0000 +++ lisp/progmodes/cc-langs.el 2011-12-12 05:32:49 +0000 @@ -522,7 +522,7 @@ (c-lang-defconst c-vsemi-status-unknown-p-fn "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". -The (admittedly kludgey) purpose of such a function is to prevent an infinite +The (admittedly kludgy) purpose of such a function is to prevent an infinite recursion in c-beginning-of-statement-1 when point starts at a `while' token. The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, even indirectly. This variable contains nil for languages which don't have === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2011-11-20 02:29:42 +0000 +++ lisp/progmodes/cc-mode.el 2011-12-12 05:32:49 +0000 @@ -943,7 +943,7 @@ ;; Note that this function must be FAST rather than accurate. Note ;; also that it only has any effect when font locking is enabled. ;; We exploit this by checking for font-lock-*-face instead of doing - ;; rigourous syntactic analysis. + ;; rigorous syntactic analysis. ;; If either change boundary is wholly inside an identifier, delete ;; it/them from the cache. Don't worry about being inside a string === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2011-11-24 08:21:03 +0000 +++ lisp/progmodes/grep.el 2011-12-12 05:32:49 +0000 @@ -108,7 +108,7 @@ Setting it causes the grep commands to put point at the end of their output window so that the end of the output is always visible rather -than the begining." +than the beginning." :type 'boolean :version "22.1" :group 'grep) === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2011-11-27 04:43:11 +0000 +++ lisp/progmodes/gud.el 2011-12-12 05:32:49 +0000 @@ -1919,7 +1919,7 @@ ;; in petticoat junction. (defun gud-jdb-skip-block () - ;; Find the begining of the block. + ;; Find the beginning of the block. (while (not (eq (following-char) ?{)) @@ -1936,7 +1936,7 @@ (gud-jdb-skip-character-literal)) (t (forward-char)))) - ;; Now at the begining of the block. + ;; Now at the beginning of the block. (forward-char) ;; Skip over the body of the block as well as the final brace. === modified file 'lisp/progmodes/hideif.el' --- lisp/progmodes/hideif.el 2011-10-20 00:26:14 +0000 +++ lisp/progmodes/hideif.el 2011-12-12 05:32:49 +0000 @@ -822,7 +822,7 @@ (defun hif-possibly-hide () "Called at #ifX expression, this hides those parts that should be hidden. -It uses the judgement of `hide-ifdef-evaluator'." +It uses the judgment of `hide-ifdef-evaluator'." ;; (message "hif-possibly-hide") (sit-for 1) (let ((test (hif-canonicalize)) (range (hif-find-range))) === modified file 'lisp/progmodes/inf-lisp.el' --- lisp/progmodes/inf-lisp.el 2011-11-20 02:29:42 +0000 +++ lisp/progmodes/inf-lisp.el 2011-12-12 05:32:49 +0000 @@ -36,7 +36,7 @@ ;; This makes these modes easier to use. ;; For documentation on the functionality provided by comint mode, and -;; the hooks available for customising it, see the file comint.el. +;; the hooks available for customizing it, see the file comint.el. ;; For further information on inferior-lisp mode, see the comments below. ;; Needs fixin: === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2011-12-05 08:55:25 +0000 +++ lisp/progmodes/vhdl-mode.el 2011-12-12 05:32:49 +0000 @@ -10812,7 +10812,7 @@ (defvar vhdl-port-list nil "Variable to hold last port map parsed.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (ent-name ;; ((generic-names) generic-type generic-init generic-comment group-comment) ;; ((port-names) port-object port-direct port-type port-comment group-comment) @@ -11660,7 +11660,7 @@ (defvar vhdl-subprog-list nil "Variable to hold last subprogram interface parsed.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (subprog-name kind ;; ((names) object direct type init comment group-comment) ;; return-type return-comment group-comment) @@ -12971,7 +12971,7 @@ (defvar vhdl-entity-alist nil "Cache with entities and corresponding architectures for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (ent-key ent-name ent-file ent-line ;; (arch-key arch-name arch-file arch-line @@ -12982,7 +12982,7 @@ (defvar vhdl-config-alist nil "Cache with configurations for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (conf-key conf-name conf-file conf-line ent-key arch-key ;; (inst-key inst-comp-name inst-ent-key inst-arch-key @@ -12991,7 +12991,7 @@ (defvar vhdl-package-alist nil "Cache with packages for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (pack-key pack-name pack-file pack-line ;; (comp-key comp-name comp-file comp-line) @@ -13003,19 +13003,19 @@ (defvar vhdl-ent-inst-alist nil "Cache with instantiated entities for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key (inst-ent-key)) (defvar vhdl-file-alist nil "Cache with design units in each file for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list) ;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list)) (defvar vhdl-directory-alist nil "Cache with source directories for each project.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key (directory)) (defvar vhdl-speedbar-shown-unit-alist nil @@ -13655,7 +13655,7 @@ (vhdl-speedbar-update-current-unit) (when updated (message "Updating hierarchy...done"))))) -;; structure (parenthesised expression means list of such entries) +;; structure (parenthesized expression means list of such entries) ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker ;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker ;; comp-lib-name level) === modified file 'lisp/shell.el' --- lisp/shell.el 2011-11-20 02:29:42 +0000 +++ lisp/shell.el 2011-12-12 05:32:49 +0000 @@ -35,7 +35,7 @@ ;; This makes these modes easier to use. ;; For documentation on the functionality provided by comint mode, and -;; the hooks available for customising it, see the file comint.el. +;; the hooks available for customizing it, see the file comint.el. ;; For further information on shell mode, see the comments below. ;; Needs fixin: === modified file 'lisp/url/url-cookie.el' --- lisp/url/url-cookie.el 2011-11-03 21:53:59 +0000 +++ lisp/url/url-cookie.el 2011-12-12 05:32:49 +0000 @@ -316,7 +316,7 @@ (set (if (> trusted untrusted) 'untrusted 'trusted) nil)) (cond (untrusted - ;; The site was explicity marked as untrusted by the user. + ;; The site was explicitly marked as untrusted by the user. nil) ((or (eq url-privacy-level 'paranoid) (and (listp url-privacy-level) (memq 'cookies url-privacy-level))) === modified file 'lisp/url/url-vars.el' --- lisp/url/url-vars.el 2011-11-17 09:09:20 +0000 +++ lisp/url/url-vars.el 2011-12-12 05:32:49 +0000 @@ -62,7 +62,6 @@ (mapc 'make-variable-buffer-local '( url-current-object - url-current-referer url-current-mime-headers )) === modified file 'src/ChangeLog.10' --- src/ChangeLog.10 2011-12-04 08:02:42 +0000 +++ src/ChangeLog.10 2011-12-12 05:32:49 +0000 @@ -15816,14 +15816,14 @@ Add prototypes. * macterm.c (mac_draw_bitmap): Add overlay_p arg. - (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps; + (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps; thanks to YAMAMOTO Mitsuharu for advice on how to do this. Use cursor color for displaying cursor in fringe. (x_redisplay_interface): Add null handlers for define_fringe_bitmap and destroy_fringe_bitmap functions. * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from - xterm.c to handle overlayed fringe bitmaps and to use cursor color + xterm.c to handle overlaid fringe bitmaps and to use cursor color for displaying cursor in fringe. (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 specific functions to define and destroy fringe bitmaps in fringe_bmp. @@ -15849,7 +15849,7 @@ (display_line): Handle cursor in fringe at eob. (display_line): Set row user fringe bitmaps from iterator. - * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps. + * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps. Use cursor color for displaying cursor in fringe. (x_redisplay_interface): Add null handlers for define_fringe_bitmap and destroy_fringe_bitmap functions. === modified file 'src/ChangeLog.2' --- src/ChangeLog.2 2011-12-04 08:02:42 +0000 +++ src/ChangeLog.2 2011-12-12 05:32:49 +0000 @@ -2254,7 +2254,7 @@ Initialize save_color. * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: - Delete/replace unused/conditionalised variables + Delete/replace unused/conditionalized variables 1987-01-15 Richard M. Stallman (rms@prep) @@ -2632,7 +2632,7 @@ * fns.c: Fding requires an arg; pass Qnil. * m-alliant.h: define TEXT_START as 0x1000. - Don't define LIBS_STANDARD; the default (sharable) library + Don't define LIBS_STANDARD; the default (shareable) library is said to work now. * alloc.c (mark_object): Now pass address of slot being marked. @@ -4220,7 +4220,7 @@ Increase PURESIZE again (sigh) * unexec.c (write_segment): - Kludgey coercions ("(int)") to get this line to compile: + Kludgy coercions ("(int)") to get this line to compile: nwrite = (((int) ptr + 128) & ~127) - (int) ptr; Also changed incorrect ~128 to ~127. === modified file 'src/alloc.c' --- src/alloc.c 2011-11-20 03:07:02 +0000 +++ src/alloc.c 2011-12-12 05:32:49 +0000 @@ -6399,7 +6399,7 @@ Vgc_cons_percentage = make_float (0.1); DEFVAR_INT ("pure-bytes-used", pure_bytes_used, - doc: /* Number of bytes of sharable Lisp data allocated so far. */); + doc: /* Number of bytes of shareable Lisp data allocated so far. */); DEFVAR_INT ("cons-cells-consed", cons_cells_consed, doc: /* Number of cons cells that have been consed so far. */); === modified file 'src/editfns.c' --- src/editfns.c 2011-10-20 06:52:55 +0000 +++ src/editfns.c 2011-12-12 05:32:49 +0000 @@ -3870,7 +3870,7 @@ enum { /* Maximum precision for a %f conversion such that the - trailing output digit might be nonzero. Any precisions + trailing output digit might be nonzero. Any precision larger than this will not yield useful information. */ USEFUL_PRECISION_MAX = ((1 - DBL_MIN_EXP) === modified file 'src/emacs.c' --- src/emacs.c 2011-12-04 09:26:30 +0000 +++ src/emacs.c 2011-12-12 05:32:49 +0000 @@ -951,7 +951,7 @@ } /* Command line option --no-windows is deprecated and thus not mentioned - in the manual and usage informations. */ + in the manual and usage information. */ if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) inhibit_window_system = 1; === modified file 'src/fontset.c' --- src/fontset.c 2011-12-04 08:02:42 +0000 +++ src/fontset.c 2011-12-12 05:32:49 +0000 @@ -643,7 +643,7 @@ if (font_has_char (f, font_object, c)) goto found; - /* Find a font already opened, maching with the current spec, + /* Find a font already opened, matching with the current spec, and supporting C. */ font_def = RFONT_DEF_FONT_DEF (rfont_def); for (; found_index + 1 < ASIZE (vec); found_index++) === modified file 'src/ftfont.c' --- src/ftfont.c 2011-12-08 02:34:09 +0000 +++ src/ftfont.c 2011-12-12 05:32:49 +0000 @@ -960,7 +960,7 @@ /* Need fix because this finds any fonts. */ if (fontset->nfont == 0 && ! NILP (family)) { - /* Try maching with configuration. For instance, the + /* Try matching with configuration. For instance, the configuration may specify "Nimbus Mono L" as an alias of "Courier". */ FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, === modified file 'src/lastfile.c' --- src/lastfile.c 2011-01-25 04:08:28 +0000 +++ src/lastfile.c 2011-12-12 05:32:49 +0000 @@ -23,7 +23,7 @@ The files of Emacs are written so as to have no initialized data that can ever need to be altered except at the first startup. - This is so that those words can be dumped as sharable text. + This is so that those words can be dumped as shareable text. It is not possible to exercise such control over library files. So it is necessary to refrain from making their data areas shared. @@ -47,4 +47,3 @@ of the bss area used by Emacs. */ static char _my_endbss[1]; char * my_endbss_static = _my_endbss; - === modified file 'src/lread.c' --- src/lread.c 2011-12-07 02:16:53 +0000 +++ src/lread.c 2011-12-12 05:32:49 +0000 @@ -2822,7 +2822,7 @@ So we now use the same heuristic as for backquote: old-style unquotes are only recognized when first on a list, and when followed by a space. - Because it's more difficult to peak 2 chars ahead, a new-style + Because it's more difficult to peek 2 chars ahead, a new-style ,@ can still not be used outside of a `, unless it's in the middle of a list. */ if (new_backquote_flag === modified file 'src/nsfont.m' --- src/nsfont.m 2011-11-20 19:35:27 +0000 +++ src/nsfont.m 2011-12-12 05:32:49 +0000 @@ -630,7 +630,7 @@ } -/* Return a font entity most closely maching with FONT_SPEC on +/* Return a font entity most closely matching with FONT_SPEC on FRAME. The closeness is determined by the font backend, thus `face-font-selection-order' is ignored here. Properties to be considered are same as for list(). */ === modified file 'src/region-cache.c' --- src/region-cache.c 2011-08-05 02:15:35 +0000 +++ src/region-cache.c 2011-12-12 05:32:49 +0000 @@ -699,7 +699,7 @@ /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position after POS where the knownness changes. */ + position after POS where the knowledge changes. */ int region_cache_forward (struct buffer *buf, struct region_cache *c, ptrdiff_t pos, ptrdiff_t *next) @@ -736,7 +736,7 @@ /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position before POS where the knownness changes. */ + position before POS where the knowledge changes. */ int region_cache_backward (struct buffer *buf, struct region_cache *c, ptrdiff_t pos, ptrdiff_t *next) { === modified file 'src/region-cache.h' --- src/region-cache.h 2011-08-05 02:15:35 +0000 +++ src/region-cache.h 2011-12-12 05:32:49 +0000 @@ -97,7 +97,7 @@ /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position after POS where the knownness changes. */ + position after POS where the knowledge changes. */ extern int region_cache_forward (struct buffer *BUF, struct region_cache *CACHE, ptrdiff_t POS, @@ -105,7 +105,7 @@ /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position before POS where the knownness changes. */ + position before POS where the knowledge changes. */ extern int region_cache_backward (struct buffer *BUF, struct region_cache *CACHE, ptrdiff_t POS, === modified file 'src/termhooks.h' --- src/termhooks.h 2011-07-20 00:09:31 +0000 +++ src/termhooks.h 2011-12-12 05:32:49 +0000 @@ -553,7 +553,7 @@ /* Arrange for all scroll bars on FRAME to be removed at the next call to `*judge_scroll_bars_hook'. A scroll bar may be spared if - `*redeem_scroll_bar_hook' is applied to its window before the judgement. + `*redeem_scroll_bar_hook' is applied to its window before the judgment. This should be applied to each frame each time its window tree is redisplayed, even if it is not displaying scroll bars at the moment; @@ -565,7 +565,7 @@ currently displaying them. */ void (*condemn_scroll_bars_hook) (struct frame *frame); - /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. + /* Unmark WINDOW's scroll bar for deletion in this judgment cycle. Note that it's okay to redeem a scroll bar that is not condemned. */ void (*redeem_scroll_bar_hook) (struct window *window); === modified file 'src/xfns.c' --- src/xfns.c 2011-12-04 08:02:42 +0000 +++ src/xfns.c 2011-12-12 05:32:49 +0000 @@ -1877,7 +1877,7 @@ #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ -static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; +static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; /* Create an Xt fontset spec from the name of a base font. If `motif' is True use the Motif syntax. */ @@ -1888,7 +1888,7 @@ char *fontsetname; /* Make a fontset name from the base font name. */ - if (xic_defaut_fontset == base_fontname) + if (xic_default_fontset == base_fontname) { /* There is no base font name, use the default. */ ptrdiff_t len = strlen (base_fontname) + 2; fontsetname = xmalloc (len); @@ -1912,12 +1912,12 @@ modify it to generalize it to allcs and allfamilies. Use the specified font plus the default. */ ptrdiff_t len = - strlen (base_fontname) + strlen (xic_defaut_fontset) + 3; + strlen (base_fontname) + strlen (xic_default_fontset) + 3; fontsetname = xmalloc (len); memset (fontsetname, 0, len); strcpy (fontsetname, base_fontname); strcat (fontsetname, sep); - strcat (fontsetname, xic_defaut_fontset); + strcat (fontsetname, xic_default_fontset); } else { ------------------------------------------------------------ revno: 106665 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2011-12-11 18:08:11 +0100 message: Fix typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-11 14:49:48 +0000 +++ lisp/ChangeLog 2011-12-11 17:08:11 +0000 @@ -1,3 +1,22 @@ +2011-12-11 Juanma Barranquero + + * ses.el (ses-call-printer-return, ses-cell-property-get) + (ses-sym-rowcol, ses-printer-validate, ses-formula-record) + (ses-create-cell-variable, ses-reset-header-string) + (ses-cell-set-formula, ses-repair-cell-reference-all) + (ses-self-reference-early-detection, ses-in-print-area, ses-set-curcell) + (ses-check-curcell, ses-call-printer, ses-adjust-print-width) + (ses-print-cell-new-width, ses-formula-references, ses-relocate-formula) + (ses-aset-with-undo, ses-load, ses-truncate-cell) + (ses-read-column-printer, ses-read-default-printer, ses-insert-row) + (ses-delete-row, ses-delete-column, ses-append-row-jump-first-column) + (ses-kill-override, ses-yank-pop, ses-yank-cells, ses-yank-tsf) + (ses-yank-resize, ses-export-tab, ses-mark-row, ses-mark-column) + (ses-renarrow-buffer, ses-insert-range, ses-insert-ses-range) + (ses-safe-printer, ses-safe-formula, ses-warn-unsafe, ses--clean-!) + (ses--clean-_, ses-range, ses-select, ses-center, ses-center-span) + (ses-dashfill, ses-unsafe): Fix typos and reflow docstrings. + 2011-12-11 Vincent Belaïche * ses.el: The overall change is to add cell renaming, that is === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-10 01:51:53 +0000 +++ lisp/gnus/ChangeLog 2011-12-11 17:08:11 +0000 @@ -1,6 +1,6 @@ 2011-12-09 Tassilo Horn - * message.el (message-valid-fqdn-regexp): Udate with newly approved + * message.el (message-valid-fqdn-regexp): Update with newly approved top-level domain names ".tel" and ".asia". 2011-12-08 Katsumi Yamaoka @@ -165,7 +165,7 @@ 2011-10-17 Dave Abrahams (tiny change) - * gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691) + * gnus-registry.el (gnus-registry-enabled): Add new variable (bug#9691). (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask only while we need to find out if it should be t or nil. (gnus-registry-initialize): Don't set `gnus-registry-install' to t. @@ -324,7 +324,7 @@ 2011-09-20 Julien Danjou * auth-source.el (auth-source-netrc-create): Use default value for - password if specified. Evaluate default. + password if specified. Evaluate default. (auth-source-plstore-create): Ditto. (auth-source-plstore-create, auth-source-netrc-create): Fix default value evaluation. @@ -641,8 +641,8 @@ 2011-08-05 Andrew Cohen - * gnus-sum.el (gnus-summary-refer-article): Warp to article. This - allows article-referral to work from an nnir group. + * gnus-sum.el (gnus-summary-refer-article): Warp to article. + This allows article-referral to work from an nnir group. 2011-08-04 Andrew Cohen @@ -658,7 +658,7 @@ 2011-08-03 Andrew Cohen * nnir.el (nnir-read-server-parm): Add an argument to restrict to - server-variables only. This should fix a bug introduced with commit + server-variables only. This should fix a bug introduced with commit e1889675b7f4adf057833c5513c9374134c4e053. (nnir-run-query): 'nnir-search-engine should not be set from the global environment. @@ -1858,7 +1858,7 @@ 2011-03-21 Julien Danjou * mm-view.el (mm-display-inline-fontify): Make mode optional, and call - normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer + normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer query. (mm-inline-text): Render normal text with fontification whenever possible. @@ -2702,9 +2702,9 @@ * gnus.el (gnus-summary-line-format): Mention &user-date format in docstring. - * gnus.el (gnus-user-date-format-alist): Change default value. Use - defcustom, with type and group. Move from gnus-util.el. Rename to - gnus-summary-user-date-format-alist. + * gnus.el (gnus-user-date-format-alist): Change default value. + Use defcustom, with type and group. Move from gnus-util.el. + Rename to gnus-summary-user-date-format-alist. 2011-02-03 Glenn Morris @@ -3231,12 +3231,12 @@ 2010-12-17 Julien Danjou * gnus-util.el (gnus-rescale-image): Allow to resize images even if - they are from file. Can also scale up. + they are from file. Can also scale up. 2010-12-17 Andrew Cohen - * gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore - gnus-use-agent. + * gnus-sum.el (gnus-summary-refer-thread): Simplify code. + Restore gnus-use-agent. (gnus-get-newsgroup-headers): Avoid unwanted spaces at eol. * nnir.el (nnir-get-active): Ignore nnir-ignored-newsgroups if null. @@ -3594,7 +3594,7 @@ * nnir.el: Update to handle the registry better. (autoload): Silence byte-compiler. (nnir-open-server): Add a hook for nnir groups. - (nnir-request-move-article): Don't mangle the header. Better to use + (nnir-request-move-article): Don't mangle the header. Better to use formating variables (which will be added in the future). (nnir-registry-action): Update the registry using the original article group name. @@ -4030,7 +4030,7 @@ 2010-11-21 Andrew Cohen * nnir.el: Fix typo in comments. - (nnir-run-imap): Simplify code. No need to reverse artlist. + (nnir-run-imap): Simplify code. No need to reverse artlist. (nnir-run-gmane): Use nnir-tmp-buffer for web results. 2010-11-21 Lars Magne Ingebrigtsen @@ -4062,8 +4062,8 @@ 2010-11-19 Katsumi Yamaoka - * gnus-art.el (gnus-mime-display-single) - * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images) + * gnus-art.el (gnus-mime-display-single): + * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images): * mm-decode.el (mm-shr): Assume that gnus-inhibit-images may be a group parameter. @@ -4418,7 +4418,7 @@ * gnus-util.el (gnus-string-match-p): New function, that is an alias to string-match-p in Emacs >=23. - * gnus-msg.el (gnus-configure-posting-styles) + * gnus-msg.el (gnus-configure-posting-styles): * nnir.el (nnir-run-gmane): Use gnus-string-match-p. 2010-11-01 Glenn Morris @@ -5366,8 +5366,8 @@ * gnus-util.el (gnus-remove-if): Allow hash table. (gnus-remove-if-not): New function. - * gnus-art.el (gnus-mime-view-part-as-type) - * gnus-score.el (gnus-summary-score-effect) + * gnus-art.el (gnus-mime-view-part-as-type): + * gnus-score.el (gnus-summary-score-effect): * gnus-sum.el (gnus-read-move-group-name): Replace remove-if-not with gnus-remove-if-not. @@ -5856,8 +5856,8 @@ 2010-09-29 Katsumi Yamaoka * mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist) - (mm-mime-charset) - * rfc2047.el (rfc2047-syntax-table) + (mm-mime-charset): + * rfc2047.el (rfc2047-syntax-table): * utf7.el (utf7-utf-16-coding-system): Comment fix. * nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load' @@ -5872,8 +5872,8 @@ 2010-09-28 Katsumi Yamaoka - * mail-source.el (mail-source-report-new-mail) - * message.el (message-default-mail-headers) + * mail-source.el (mail-source-report-new-mail): + * message.el (message-default-mail-headers): * mm-decode.el (mm-valid-image-format-p): Comment fix. * mml2015.el (mml2015-use): Don't bind recursive-load-depth-limit. @@ -6369,8 +6369,8 @@ (gnus-article-next-page-1): No need to adjust the number of lines. (gnus-article-describe-bindings): Always use help-buffer. - * gnus-audio.el (gnus-audio-inline-sound) - * gnus-cus.el (gnus-custom-mode) + * gnus-audio.el (gnus-audio-inline-sound): + * gnus-cus.el (gnus-custom-mode): * gnus-group.el (gnus-group-update-tool-bar): Comment fix. * gnus-sum.el (gnus-remove-overlays): Doc fix. @@ -6566,9 +6566,9 @@ 2010-09-22 Katsumi Yamaoka - * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes) - * mm-util.el (mm-decompress-buffer) - * nnir.el (nnir-run-find-grep) + * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes): + * mm-util.el (mm-decompress-buffer): + * nnir.el (nnir-run-find-grep): * pop3.el (pop3-list): Use 3rd arg of split-string. 2010-09-21 Lars Magne Ingebrigtsen @@ -7434,7 +7434,7 @@ 2010-09-01 Katsumi Yamaoka * gnus-html.el (gnus-html-cache-directory, gnus-html-cache-size) - (gnus-html-frame-width, gnus-blocked-images) + (gnus-html-frame-width, gnus-blocked-images): * message.el (message-prune-recipient-rules): Add custom version. * gnus-sum.el (gnus-auto-expirable-marks): Bump custom version. @@ -7484,11 +7484,11 @@ * gnus-ems.el: Provide compatibility functions for gnus-set-process-plist. - * gnus-sum.el (gnus-summary-stop-at-end-of-message) - * gnus.el (gnus-valid-select-methods) - * message.el (message-send-mail-partially-limit) - * mm-decode.el (mm-text-html-renderer) - * mml.el (mml-insert-mime-headers-always) + * gnus-sum.el (gnus-summary-stop-at-end-of-message): + * gnus.el (gnus-valid-select-methods): + * message.el (message-send-mail-partially-limit): + * mm-decode.el (mm-text-html-renderer): + * mml.el (mml-insert-mime-headers-always): * smiley.el (smiley-regexp-alist): Bump custom version. 2010-08-31 Lars Magne Ingebrigtsen @@ -7820,7 +7820,7 @@ 2010-05-13 Katsumi Yamaoka - * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt) + * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt): * mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers generated within the mm-with-unibyte-current-buffer macro. @@ -7895,11 +7895,11 @@ 2010-05-07 Katsumi Yamaoka - * nnweb.el (nnweb-gmane-search) + * nnweb.el (nnweb-gmane-search): * yenc.el (yenc-decode-region): Don't run set-buffer-multibyte for XEmacs. - * gnus-art.el (gnus-article-browse-html-parts) + * gnus-art.el (gnus-article-browse-html-parts): * gnus-group.el (gnus-read-ephemeral-gmane-group) (gnus-read-ephemeral-bug-grou): Use mm-make-temp-file instead of make-temp-file. @@ -10607,10 +10607,10 @@ 2007-12-05 Katsumi Yamaoka - * gnus-art.el (gnus-use-idna) - * gnus-start.el (gnus-site-init-file) - * message.el (message-use-idna) - * mm-uu.el (mm-uu-hide-markers) + * gnus-art.el (gnus-use-idna): + * gnus-start.el (gnus-site-init-file): + * message.el (message-use-idna): + * mm-uu.el (mm-uu-hide-markers): * smiley.el (smiley-style): Revert changes that suppress warnings. 2007-12-05 Katsumi Yamaoka @@ -11912,13 +11912,13 @@ 2007-05-25 Katsumi Yamaoka * gnus-art.el (gnus-header-from, gnus-header-subject, gnus-header-name) - (gnus-header-content) - * gnus-cite.el (gnus-cite-10) - * gnus-srvr.el (gnus-server-closed) + (gnus-header-content): + * gnus-cite.el (gnus-cite-10): + * gnus-srvr.el (gnus-server-closed): * gnus.el (gnus-group-mail-1, gnus-group-mail-1-empty) (gnus-group-mail-2, gnus-group-mail-2-empty, gnus-group-mail-3) (gnus-group-mail-3-empty, gnus-group-mail-low) - (gnus-group-mail-low-empty, gnus-splash) + (gnus-group-mail-low-empty, gnus-splash): * message.el (message-header-to, message-header-cc) (message-header-subject, message-header-other, message-header-name) (message-header-xheader, message-separator, message-cited-text) === modified file 'lisp/ses.el' --- lisp/ses.el 2011-12-11 14:49:48 +0000 +++ lisp/ses.el 2011-12-11 17:08:11 +0000 @@ -327,7 +327,7 @@ (defvar ses-call-printer-return nil "Set to t if last cell printer invoked by `ses-call-printer' requested -left-justification of the result. Set to error-signal if ses-call-printer +left-justification of the result. Set to error-signal if `ses-call-printer' encountered an error during printing. Otherwise nil.") (defvar ses-start-time nil @@ -394,7 +394,7 @@ val))))) (defmacro ses-cell-property-get (property-name row &optional col) - "Get property named PROPERTY-NAME From a CELL or a pair (ROW,COL). + "Get property named PROPERTY-NAME from a CELL or a pair (ROW,COL). When COL is omitted, CELL=ROW is a cell object. When COL is present ROW and COL are the integer coordinates of the cell of @@ -490,8 +490,8 @@ `(aref ses--col-printers ,col)) (defmacro ses-sym-rowcol (sym) - "From a cell-symbol SYM, gets the cons (row . col). A1 => (0 . 0). Result -is nil if SYM is not a symbol that names a cell." + "From a cell-symbol SYM, gets the cons (row . col). A1 => (0 . 0). +Result is nil if SYM is not a symbol that names a cell." `(and (symbolp ,sym) (get ,sym 'ses-cell))) (defmacro ses-cell (sym value formula printer references) @@ -625,7 +625,7 @@ (delete-region pos (point)))) (defun ses-printer-validate (printer) - "Signals an error if PRINTER is not a valid SES cell printer." + "Signal an error if PRINTER is not a valid SES cell printer." (or (not printer) (stringp printer) (functionp printer) @@ -642,7 +642,7 @@ (add-to-list 'ses-read-printer-history (prin1-to-string printer)))) (defun ses-formula-record (formula) - "If FORMULA is of the form 'symbol, adds it to the list of symbolic formulas + "If FORMULA is of the form 'symbol, add it to the list of symbolic formulas for this spreadsheet." (when (and (eq (car-safe formula) 'quote) (symbolp (cadr formula))) @@ -676,7 +676,7 @@ (defun ses-create-cell-variable (sym row col) "Create a buffer-local variable for cell with symbol -SYM at position ROW COL. Return nil in case of failure." +SYM at position ROW COL. Return nil in case of failure." (unless (local-variable-p sym) (make-local-variable sym) (put sym 'ses-cell (cons row col)))) @@ -698,7 +698,7 @@ buffer-undo-list)) (defun ses-reset-header-string () - "Flags the header string for update. Upon undo, the header string will be + "Flag the header string for update. Upon undo, the header string will be updated again." (push '(apply ses-reset-header-string) buffer-undo-list) (setq ses--header-hscroll -1)) @@ -734,7 +734,7 @@ nil) ; Make coverage-tester happy. (defun ses-cell-set-formula (row col formula) - "Store a new formula for (ROW . COL) and enqueues the cell for + "Store a new formula for (ROW . COL) and enqueue the cell for recalculation via `post-command-hook'. Updates the reference lists for the cells that this cell refers to. Does not update cell value or reprint the cell. To avoid inconsistencies, this function is not interruptible, which @@ -819,9 +819,9 @@ errors))))) (if errors (warn "---------------------------------------------------------------- -Some reference where corrupted. +Some references were corrupted. -The following is a list of where each element ELT is such +The following is a list where each element ELT is such that (car ELT) is the reference of cell CELL with corruption, and (cdr ELT) is a property list where @@ -929,8 +929,7 @@ (ses-cell-set-formula row col nil)) (defcustom ses-self-reference-early-detection nil - "True if cycle detection is early for cells that refer to -themselves." + "True if cycle detection is early for cells that refer to themselves." :type 'boolean :group 'ses) @@ -996,7 +995,7 @@ ;;---------------------------------------------------------------------------- (defun ses-in-print-area () - "Returns t if point is in print area of spreadsheet." + "Return t if point is in print area of spreadsheet." (<= (point) ses--data-marker)) ;; We turn off point-motion-hooks and explicitly position the cursor, in case @@ -1018,7 +1017,7 @@ (forward-char)))) (defun ses-set-curcell () - "Sets `ses--curcell' to the current cell symbol, or a cons (BEG,END) for a + "Set `ses--curcell' to the current cell symbol, or a cons (BEG,END) for a region, or nil if cursor is not at a cell." (if (or (not mark-active) deactivate-mark @@ -1037,10 +1036,10 @@ nil) (defun ses-check-curcell (&rest args) - "Signal an error if ses--curcell is inappropriate. The end marker is -appropriate if some argument is 'end. A range is appropriate if some -argument is 'range. A single cell is appropriate unless some argument is -'needrange." + "Signal an error if `ses--curcell' is inappropriate. +The end marker is appropriate if some argument is 'end. +A range is appropriate if some argument is 'range. +A single cell is appropriate unless some argument is 'needrange." (if (eq ses--curcell t) ;; curcell recalculation was postponed, but user typed ahead. (ses-set-curcell)) @@ -1175,7 +1174,7 @@ sig))) (defun ses-call-printer (printer &optional value) - "Invokes PRINTER (a string or parenthesized string or function-symbol or + "Invoke PRINTER (a string or parenthesized string or function-symbol or lambda of one argument) on VALUE. Result is the printed cell as a string. The variable `ses-call-printer-return' is set to t if the printer used parenthesis to request left-justification, or the error-signal if the @@ -1207,7 +1206,7 @@ (defun ses-adjust-print-width (col change) "Insert CHANGE spaces in front of column COL, or at end of line if COL=NUMCOLS. Deletes characters if CHANGE < 0. Caller should bind -inhibit-quit to t." +`inhibit-quit' to t." (let ((inhibit-read-only t) (blank (if (> change 0) (make-string change ?\s))) (at-end (= col ses--numcols))) @@ -1226,9 +1225,9 @@ (delete-char (- change)))))) (defun ses-print-cell-new-width (row col) - "Same as ses-print-cell, except if the cell's value is *skip*, the preceding -nonskipped cell is reprinted. This function is used when the width of -cell (ROW,COL) has changed." + "Same as `ses-print-cell', except if the cell's value is *skip*, +the preceding nonskipped cell is reprinted. This function is used +when the width of cell (ROW,COL) has changed." (if (not (eq (ses-cell-value row col) '*skip*)) (ses-print-cell row col) ;;Cell was skipped over - reprint previous @@ -1351,7 +1350,7 @@ ;;---------------------------------------------------------------------------- (defun ses-formula-references (formula &optional result-so-far) - "Produce a list of symbols for cells that this formula's value + "Produce a list of symbols for cells that this FORMULA's value refers to. For recursive calls, RESULT-SO-FAR is the list being constructed, or t to get a wrong-type-argument error when the first reference is found." @@ -1396,8 +1395,8 @@ (defun ses-relocate-formula (formula startrow startcol rowincr colincr) "Produce a copy of FORMULA where all symbols that refer to cells in row -STARTROW or above and col STARTCOL or above are altered by adding ROWINCR -and COLINCR. STARTROW and STARTCOL are 0-based. Example: +STARTROW or above, and col STARTCOL or above, are altered by adding ROWINCR +and COLINCR. STARTROW and STARTCOL are 0-based. Example: (ses-relocate-formula '(+ A1 B2 D3) 1 2 1 -1) => (+ A1 B2 C4) If ROWINCR or COLINCR is negative, references to cells being deleted are @@ -1647,7 +1646,8 @@ (makunbound sym))) (defun ses-aset-with-undo (array idx newval) - "Like aset, but undoable. Result is t if element has changed" + "Like `aset', but undoable. +Result is t if element has changed." (unless (equal (aref array idx) newval) (push `(apply ses-aset-with-undo ,array ,idx ,(aref array idx)) buffer-undo-list) @@ -1660,8 +1660,8 @@ ;;---------------------------------------------------------------------------- (defun ses-load () - "Parse the current buffer and sets up buffer-local variables. Does not -execute cell formulas or print functions." + "Parse the current buffer and set up buffer-local variables. +Does not execute cell formulas or print functions." (widen) ;; Read our global parameters, which should be a 3-element list. (goto-char (point-max)) @@ -2109,8 +2109,7 @@ (ses-jump-safe startcell))) (defun ses-truncate-cell () - "Reprint current cell, but without spillover into any following blank -cells." + "Reprint current cell, but without spillover into any following blank cells." (interactive "*") (ses-check-curcell) (let* ((rowcol (ses-sym-rowcol ses--curcell)) @@ -2358,8 +2357,8 @@ (ses-print-cell row col)))) (defun ses-read-column-printer (col newval) - "Set the printer function for the current column. See -`ses-read-cell-printer' for input forms." + "Set the printer function for the current column. +See `ses-read-cell-printer' for input forms." (interactive (let ((col (cdr (ses-sym-rowcol ses--curcell)))) (ses-check-curcell) @@ -2375,8 +2374,8 @@ (ses-print-cell row col))))) (defun ses-read-default-printer (newval) - "Set the default printer function for cells that have no other. See -`ses-read-cell-printer' for input forms." + "Set the default printer function for cells that have no other. +See `ses-read-cell-printer' for input forms." (interactive (list (ses-read-printer "Default printer: " ses--default-printer))) (unless (eq newval t) @@ -2390,8 +2389,8 @@ ;;---------------------------------------------------------------------------- (defun ses-insert-row (count) - "Insert a new row before the current one. With prefix, insert COUNT rows -before current one." + "Insert a new row before the current one. +With prefix, insert COUNT rows before current one." (interactive "*p") (ses-check-curcell 'end) (or (> count 0) (signal 'args-out-of-range nil)) @@ -2443,8 +2442,8 @@ (ses-goto-print (1- ses--numrows) 0))) (defun ses-delete-row (count) - "Delete the current row. With prefix, Deletes COUNT rows starting from the -current one." + "Delete the current row. +With prefix, deletes COUNT rows starting from the current one." (interactive "*p") (ses-check-curcell) (or (> count 0) (signal 'args-out-of-range nil)) @@ -2536,8 +2535,8 @@ (ses-jump-safe ses--curcell)) (defun ses-delete-column (count) - "Delete the current column. With prefix, Deletes COUNT columns starting -from the current one." + "Delete the current column. +With prefix, deletes COUNT columns starting from the current one." (interactive "*p") (ses-check-curcell) (or (> count 0) (signal 'args-out-of-range nil)) @@ -2611,7 +2610,7 @@ (forward-char))) (defun ses-append-row-jump-first-column () - "Insert a new row after current one and jumps to its first column." + "Insert a new row after current one and jump to its first column." (interactive "*") (ses-check-curcell) (ses-begin-change) @@ -2714,8 +2713,8 @@ line) (defun ses-kill-override (beg end) - "Generic override for any commands that kill text. We clear the killed -cells instead of deleting them." + "Generic override for any commands that kill text. +We clear the killed cells instead of deleting them." (interactive "r") (ses-check-curcell 'needrange) ;; For some reason, the text-read-only error is not caught by `delete-region', @@ -2776,9 +2775,9 @@ (defun ses-yank-pop (arg) "Replace just-yanked stretch of killed text with a different stretch. -This command is allowed only immediately after a `yank' or a `yank-pop', when -the region contains a stretch of reinserted previously-killed text. We -replace it with a different stretch of killed text. +This command is allowed only immediately after a `yank' or a `yank-pop', +when the region contains a stretch of reinserted previously-killed text. +We replace it with a different stretch of killed text. Unlike standard `yank-pop', this function uses `undo' to delete the previous insertion." (interactive "*p") @@ -2792,7 +2791,7 @@ (setq this-command 'yank)) (defun ses-yank-cells (text arg) - "If the TEXT has a proper set of 'ses attributes, inserts the text as + "If the TEXT has a proper set of 'ses attributes, insert the text as cells, else return nil. The cells are reprinted--the supplied text is ignored because the column widths, default printer, etc. at yank time might be different from those at kill-time. ARG is a list to indicate that @@ -2875,8 +2874,8 @@ (ses-cell-set-formula row col val)))) (defun ses-yank-tsf (text arg) - "If TEXT contains tabs and/or newlines, treats the tabs as -column-separators and the newlines as row-separators and inserts the text as + "If TEXT contains tabs and/or newlines, treat the tabs as +column-separators and the newlines as row-separators and insert the text as cell formulas--else return nil. Treat plain symbols as strings unless ARG is a list. Ignore a final newline." (if (or (not (string-match "[\t\n]" text)) @@ -2914,8 +2913,8 @@ t))) (defun ses-yank-resize (needrows needcols) - "If this yank will require inserting rows and/or columns, asks for -confirmation and then inserts them. Result is (row,col) for top left of yank + "If this yank will require inserting rows and/or columns, ask for +confirmation and then insert them. Result is (row,col) for top left of yank spot, or error signal if user requests cancel." (ses-begin-change) (let ((rowcol (if ses--curcell @@ -2958,9 +2957,9 @@ (ses-export-tab t)) (defun ses-export-tab (want-formulas) - "Export the current range with tabs between columns and newlines between -rows. Result is placed in kill ring. The export is values unless -WANT-FORMULAS is non-nil. Newlines and tabs in the export text are escaped." + "Export the current range with tabs between columns and newlines between rows. +Result is placed in kill ring. The export is values unless WANT-FORMULAS +is non-nil. Newlines and tabs in the export text are escaped." (ses-check-curcell 'needrange) (let ((print-escape-newlines t) result item) @@ -3019,7 +3018,7 @@ (ses-reset-header-string)) (defun ses-mark-row () - "Marks the entirety of current row as a range." + "Mark the entirety of current row as a range." (interactive) (ses-check-curcell 'range) (let ((row (car (ses-sym-rowcol (or (car-safe ses--curcell) ses--curcell))))) @@ -3029,7 +3028,7 @@ (ses-goto-print row 0))) (defun ses-mark-column () - "Marks the entirety of current column as a range." + "Mark the entirety of current column as a range." (interactive) (ses-check-curcell 'range) (let ((col (cdr (ses-sym-rowcol (or (car-safe ses--curcell) ses--curcell)))) @@ -3073,13 +3072,14 @@ (ses-goto-print row col))))) (defun ses-renarrow-buffer () - "Narrow the buffer so only the print area is visible. Use after \\[widen]." + "Narrow the buffer so only the print area is visible. +Use after \\[widen]." (interactive) (setq ses--deferred-narrow t)) (defun ses-sort-column (sorter &optional reverse) - "Sorts the range by a specified column. With prefix, sorts in -REVERSE order." + "Sort the range by a specified column. +With prefix, sorts in REVERSE order." (interactive "*sSort column: \nP") (ses-check-curcell 'needrange) (let ((min (ses-sym-rowcol (car ses--curcell))) @@ -3130,7 +3130,7 @@ (ses-sort-column (ses-column-letter col) reverse)))) (defun ses-insert-range () - "Inserts into minibuffer the list of cells currently highlighted in the + "Insert into minibuffer the list of cells currently highlighted in the spreadsheet." (interactive "*") (let (x) @@ -3142,7 +3142,7 @@ (insert (substring (prin1-to-string (nreverse x)) 1 -1)))) (defun ses-insert-ses-range () - "Inserts \"(ses-range x y)\" in the minibuffer to represent the currently + "Insert \"(ses-range x y)\" in the minibuffer to represent the currently highlighted range in the spreadsheet." (interactive "*") (let (x) @@ -3226,7 +3226,7 @@ ;;---------------------------------------------------------------------------- (defun ses-safe-printer (printer) - "Returns PRINTER if safe, or the substitute printer `ses-unsafe' otherwise." + "Return PRINTER if safe, or the substitute printer `ses-unsafe' otherwise." (if (or (stringp printer) (stringp (car-safe printer)) (not printer) @@ -3235,16 +3235,16 @@ 'ses-unsafe)) (defun ses-safe-formula (formula) - "Returns FORMULA if safe, or the substitute formula *unsafe* otherwise." + "Return FORMULA if safe, or the substitute formula *unsafe* otherwise." (if (ses-warn-unsafe formula 'unsafep) formula `(ses-unsafe ',formula))) (defun ses-warn-unsafe (formula checker) - "Applies CHECKER to FORMULA. If result is non-nil, asks user for -confirmation about FORMULA, which might be unsafe. Returns t if formula -is safe or user allows execution anyway. Always returns t if -`safe-functions' is t." + "Apply CHECKER to FORMULA. +If result is non-nil, asks user for confirmation about FORMULA, +which might be unsafe. Returns t if formula is safe or user allows +execution anyway. Always returns t if `safe-functions' is t." (if (eq safe-functions t) t (setq checker (funcall checker formula)) @@ -3259,13 +3259,13 @@ ;;---------------------------------------------------------------------------- (defun ses--clean-! (&rest x) - "Clean by delq list X from any occurrence of `nil' or `*skip*'." + "Clean by `delq' list X from any occurrence of `nil' or `*skip*'." (delq nil (delq '*skip* x))) (defun ses--clean-_ (x y) "Clean list X by replacing by Y any occurrence of `nil' or `*skip*'. -This will change X by making setcar on its cons cells." +This will change X by making `setcar' on its cons cells." (let ((ret x) ret-elt) (while ret (setq ret-elt (car ret)) @@ -3275,7 +3275,7 @@ x) (defmacro ses-range (from to &rest rest) - "Expands to a list of cell-symbols for the range going from + "Expand to a list of cell-symbols for the range going from FROM up to TO. The range automatically expands to include any new row or column inserted into its middle. The SES library code specifically looks for the symbol `ses-range', so don't create an @@ -3288,8 +3288,8 @@ 1 2 3 and 4. Readout direction is specified by a `>v', '`>^', `', `v<', `^>', `^<' flag. For historical reasons, in absence -of such a flag, a default direction of `^<' is assumed. This +`v>', `v<', `^>', `^<' flag. For historical reasons, in absence +of such a flag, a default direction of `^<' is assumed. This way `(ses-range A1 B2 ^>)' will evaluate to `(1 3 2 4)', while `(ses-range A1 B2 >^)' will evaluate to (3 4 1 2). @@ -3302,18 +3302,18 @@ A `!' flag will remove all cells whose value is nil or `*skip*'. A `_' flag will replace nil or `*skip*' by the value following -the `_' flag. If the `_' flag is the last argument, then they are +the `_' flag. If the `_' flag is the last argument, then they are replaced by integer 0. A `*', `*1' or `*2' flag will vectorize the range in the sense of -Calc. See info node `(Calc) Top'. Flag `*' will output either a +Calc. See info node `(Calc) Top'. Flag `*' will output either a vector or a matrix depending on the number of rows, `*1' will flatten the result to a one row vector, and `*2' will make a matrix whatever the number of rows. Warning: interaction with Calc is experimental and may produce -confusing results if you are not aware of Calc data format. Use -`math-format-value' as a printer for Calc objects." +confusing results if you are not aware of Calc data format. +Use `math-format-value' as a printer for Calc objects." (let (result-row result (prev-row -1) @@ -3400,10 +3400,10 @@ (/ (float (apply '+ list)) (length list))) (defmacro ses-select (fromrange test torange) - "Select cells in FROMRANGE that are `equal' to TEST. For each match, return -the corresponding cell from TORANGE. The ranges are macroexpanded but not -evaluated so they should be either (ses-range BEG END) or (list ...). The -TEST is evaluated." + "Select cells in FROMRANGE that are `equal' to TEST. +For each match, return the corresponding cell from TORANGE. +The ranges are macroexpanded but not evaluated so they should be +either (ses-range BEG END) or (list ...). The TEST is evaluated." (setq fromrange (cdr (macroexpand fromrange)) torange (cdr (macroexpand torange)) test (eval test)) @@ -3433,9 +3433,10 @@ (defvar col) (defun ses-center (value &optional span fill) - "Print VALUE, centered within column. FILL is the fill character for -centering (default = space). SPAN indicates how many additional rightward -columns to include in width (default = 0)." + "Print VALUE, centered within column. +FILL is the fill character for centering (default = space). +SPAN indicates how many additional rightward columns to include +in width (default = 0)." (let ((printer (or (ses-col-printer col) ses--default-printer)) (width (ses-col-width col)) half) @@ -3454,8 +3455,8 @@ (defun ses-center-span (value &optional fill) "Print VALUE, centered within the span that starts in the current column -and continues until the next nonblank column. FILL specifies the fill -character (default = space)." +and continues until the next nonblank column. +FILL specifies the fill character (default = space)." (let ((end (1+ col))) (while (and (< end ses--numcols) (memq (ses-cell-value row end) '(nil *skip*))) @@ -3463,8 +3464,8 @@ (ses-center value (- end col 1) fill))) (defun ses-dashfill (value &optional span) - "Print VALUE centered using dashes. SPAN indicates how many rightward -columns to include in width (default = 0)." + "Print VALUE centered using dashes. +SPAN indicates how many rightward columns to include in width (default = 0)." (ses-center value span ?-)) (defun ses-dashfill-span (value) @@ -3478,7 +3479,7 @@ (ses-center-span value ?~)) (defun ses-unsafe (value) - "Substitute for an unsafe formula or printer" + "Substitute for an unsafe formula or printer." (error "Unsafe formula or printer")) ;;All standard printers are safe, including ses-unsafe! ------------------------------------------------------------ revno: 106664 committer: Vincent Belaïche branch nick: trunk timestamp: Sun 2011-12-11 15:49:48 +0100 message: The overall change is to add cell renaming, that is setting fancy names for cell symbols other than name matching "\\`[A-Z]+[0-9]+\\'" regexp . (ses-create-cell-variable): New defun. (ses-relocate-formula): Relocate formulas only for cells the symbols of which are not renamed, i.e. symbols whose names do not match regexp "\\`[A-Z]+[0-9]+\\'". (ses-relocate-all): Relocate values only for cells the symbols of which are not renamed. (ses-load): Create cells variables as the (ses-cell ...) are read, in order to check row col consistency with cell symbol name only for cells that are not renamed. (ses-replace-name-in-formula): New defun. (ses-rename-cell): New defun. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-11 13:17:07 +0000 +++ lisp/ChangeLog 2011-12-11 14:49:48 +0000 @@ -1,3 +1,20 @@ +2011-12-11 Vincent Belaïche + + * ses.el: The overall change is to add cell renaming, that is + setting fancy names for cell symbols other than name matching + "\\`[A-Z]+[0-9]+\\'" regexp . + (ses-create-cell-variable): New defun. + (ses-relocate-formula): Relocate formulas only for cells the + symbols of which are not renamed, i.e. symbols whose names do not + match regexp "\\`[A-Z]+[0-9]+\\'". + (ses-relocate-all): Relocate values only for cells the symbols of + which are not renamed. + (ses-load): Create cells variables as the (ses-cell ...) are read, + in order to check row col consistency with cell symbol name only + for cells that are not renamed. + (ses-replace-name-in-formula): New defun. + (ses-rename-cell): New defun. + 2011-12-11 Chong Yidong * progmodes/gdb-mi.el (gdb): Set comint-prompt-regexp, required === modified file 'lisp/ses.el' --- lisp/ses.el 2011-12-04 08:02:42 +0000 +++ lisp/ses.el 2011-12-11 14:49:48 +0000 @@ -674,6 +674,13 @@ (put sym 'ses-cell (cons xrow xcol)) (make-local-variable sym))))) +(defun ses-create-cell-variable (sym row col) + "Create a buffer-local variable for cell with symbol +SYM at position ROW COL. Return nil in case of failure." + (unless (local-variable-p sym) + (make-local-variable sym) + (put sym 'ses-cell (cons row col)))) + ;; We do not delete the ses-cell properties for the cell-variables, in ;; case a formula that refers to this cell is in the kill-ring and is ;; later pasted back in. @@ -1400,7 +1407,8 @@ Sets `ses-relocate-return' to 'delete if cell-references were removed." (let (rowcol result) (if (or (atom formula) (eq (car formula) 'quote)) - (if (setq rowcol (ses-sym-rowcol formula)) + (if (and (setq rowcol (ses-sym-rowcol formula)) + (string-match "\\`[A-Z]+[0-9]+\\'" (symbol-name formula))) (ses-relocate-symbol formula rowcol startrow startcol rowincr colincr) formula) ; Pass through as-is. @@ -1508,14 +1516,15 @@ the rectangle (MINROW,MINCOL)..(NUMROWS,NUMCOLS) by adding ROWINCR and COLINCR to each symbol." (let (reform) - (let (mycell newval) + (let (mycell newval xrow) (dotimes-with-progress-reporter (row ses--numrows) "Relocating formulas..." (dotimes (col ses--numcols) (setq ses-relocate-return nil mycell (ses-get-cell row col) newval (ses-relocate-formula (ses-cell-formula mycell) - minrow mincol rowincr colincr)) + minrow mincol rowincr colincr) + xrow (- row rowincr)) (ses-set-cell row col 'formula newval) (if (eq ses-relocate-return 'range) ;; This cell contains a (ses-range X Y) where a cell has been @@ -1531,8 +1540,22 @@ minrow mincol rowincr colincr)) (ses-set-cell row col 'references newval) (and (>= row minrow) (>= col mincol) - (ses-set-cell row col 'symbol - (ses-create-cell-symbol row col)))))) + (let ((sym (ses-cell-symbol row col)) + (xcol (- col colincr))) + (if (and + sym + (>= xrow 0) + (>= xcol 0) + (null (eq sym + (ses-create-cell-symbol xrow xcol)))) + ;; This is a renamed cell, do not update the cell + ;; name, but just update the coordinate property. + (put sym 'ses-cell (cons row col)) + (ses-set-cell row col 'symbol + (setq sym (ses-create-cell-symbol row col))) + (unless (and (boundp sym) (local-variable-p sym)) + (set (make-local-variable sym) nil) + (put sym 'ses-cell (cons row col)))))) ))) ;; Relocate the cell values. (let (oldval myrow mycol xrow xcol) (cond @@ -1545,11 +1568,17 @@ (setq mycol (+ col mincol) xrow (- myrow rowincr) xcol (- mycol colincr)) - (if (and (< xrow ses--numrows) (< xcol ses--numcols)) - (setq oldval (ses-cell-value xrow xcol)) - ;; Cell is off the end of the array. - (setq oldval (symbol-value (ses-create-cell-symbol xrow xcol)))) - (ses-set-cell myrow mycol 'value oldval)))) + (let ((sym (ses-cell-symbol myrow mycol)) + (xsym (ses-create-cell-symbol xrow xcol))) + ;; Make the value relocation only when if the cell is not + ;; a renamed cell. Otherwise this is not needed. + (and (eq sym xsym) + (ses-set-cell myrow mycol 'value + (if (and (< xrow ses--numrows) (< xcol ses--numcols)) + (ses-cell-value xrow xcol) + ;;Cell is off the end of the array + (symbol-value xsym)))))))) + ((and (wholenump rowincr) (wholenump colincr)) ;; Insertion of rows and/or columns. Run the loop backwards. (let ((disty (1- ses--numrows)) @@ -1658,7 +1687,6 @@ (message "Upgrading from SES-1 file format"))) (or (= ses--file-format 2) (error "This file needs a newer version of the SES library code")) - (ses-create-cell-variable-range 0 (1- ses--numrows) 0 (1- ses--numcols)) ;; Initialize cell array. (setq ses--cells (make-vector ses--numrows nil)) (dotimes (row ses--numrows) @@ -1678,11 +1706,10 @@ (dotimes (row ses--numrows) (dotimes (col ses--numcols) (let* ((x (read (current-buffer))) - (rowcol (ses-sym-rowcol (car-safe (cdr-safe x))))) + (sym (car-safe (cdr-safe x)))) (or (and (looking-at "\n") (eq (car-safe x) 'ses-cell) - (eq row (car rowcol)) - (eq col (cdr rowcol))) + (ses-create-cell-variable sym row col)) (error "Cell-def error")) (eval x))) (or (looking-at "\n\n") @@ -3139,6 +3166,60 @@ (mouse-set-point event) (ses-insert-ses-range)) +(defun ses-replace-name-in-formula (formula old-name new-name) + (let ((new-formula formula)) + (unless (and (consp formula) + (eq (car-safe formula) 'quote)) + (while formula + (let ((elt (car-safe formula))) + (cond + ((consp elt) + (setcar formula (ses-replace-name-in-formula elt old-name new-name))) + ((and (symbolp elt) + (eq (car-safe formula) old-name)) + (setcar formula new-name)))) + (setq formula (cdr formula)))) + new-formula)) + +(defun ses-rename-cell (new-name) + "Rename current cell." + (interactive "*SEnter new name: ") + (ses-check-curcell) + (or + (and (local-variable-p new-name) + (ses-sym-rowcol new-name) + (error "Already a cell name")) + (and (boundp new-name) + (null (yes-or-no-p (format "`%S' is already bound outside this buffer, continue? " + new-name))) + (error "Already a bound cell name"))) + (let* ((rowcol (ses-sym-rowcol ses--curcell)) + (cell (ses-get-cell (car rowcol) (cdr rowcol)))) + (dolist (reference (ses-cell-references (car rowcol) (cdr rowcol))) + (let* ((rowcol (ses-sym-rowcol reference)) + (cell (ses-get-cell (car rowcol) (cdr rowcol)))) + (ses-cell-set-formula (car rowcol) + (cdr rowcol) + (ses-replace-name-in-formula + (ses-cell-formula cell) + ses--curcell + new-name)))) + (put new-name 'ses-cell rowcol) + (set new-name (symbol-value ses--curcell)) + (aset cell 0 new-name) + (put ses--curcell 'ses-cell nil) + (makunbound ses--curcell) + (setq ses--curcell new-name) + (let* ((pos (point)) + (inhibit-read-only t) + (col (current-column)) + (end (save-excursion + (move-to-column (1+ col)) + (if (eolp) + (+ pos (ses-col-width col) 1) + (point))))) + (put-text-property pos end 'intangible new-name))) ) + ;;---------------------------------------------------------------------------- ;; Checking formulas for safety ------------------------------------------------------------ revno: 106663 fixes bug(s): http://debbugs.gnu.org/10274 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-12-11 21:17:07 +0800 message: * progmodes/gdb-mi.el (gdb): Set comint-prompt-regexp which is required for completion via gud-gdb-fetch-lines-filter. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-11 10:38:11 +0000 +++ lisp/ChangeLog 2011-12-11 13:17:07 +0000 @@ -1,3 +1,8 @@ +2011-12-11 Chong Yidong + + * progmodes/gdb-mi.el (gdb): Set comint-prompt-regexp, required + for completion via gud-gdb-fetch-lines-filter (Bug#10274). + 2011-12-11 Eric Hanchrow * window.el (other-window): Fix docstring. === modified file 'lisp/progmodes/gdb-mi.el' --- lisp/progmodes/gdb-mi.el 2011-11-30 03:18:33 +0000 +++ lisp/progmodes/gdb-mi.el 2011-12-11 13:17:07 +0000 @@ -811,6 +811,9 @@ (define-key gud-minor-mode-map [left-margin C-mouse-3] 'gdb-mouse-jump) + (set (make-local-variable 'comint-prompt-regexp) + "^(.*gdb[+]?) *") + (add-hook 'completion-at-point-functions #'gud-gdb-completion-at-point nil 'local) (local-set-key "\C-i" 'completion-at-point) ------------------------------------------------------------ revno: 106662 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Sun 2011-12-11 21:14:31 +0900 message: coding.c (Funencodable_char_position): Pay attention to the buffer text relocation (Bug#9389). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-10 22:53:28 +0000 +++ src/ChangeLog 2011-12-11 12:08:51 +0000 @@ -1,3 +1,8 @@ +2011-12-11 Kenichi Handa + + * coding.c (Funencodable_char_position): Pay attention to the + buffer text relocation (Bug#9389). + 2011-12-10 Jan Djärv * xterm.c (x_term_init): Move call to gdk_window_add_filter before === modified file 'src/coding.c' --- src/coding.c 2011-12-08 05:54:20 +0000 +++ src/coding.c 2011-12-11 12:08:51 +0000 @@ -8756,6 +8756,7 @@ } positions = Qnil; + charset_map_loaded = 0; while (1) { int c; @@ -8783,6 +8784,16 @@ } from++; + if (charset_map_loaded && NILP (string)) + { + p = CHAR_POS_ADDR (from); + pend = CHAR_POS_ADDR (to); + if (from < GPT && to >= GPT) + stop = GPT_ADDR; + else + stop = pend; + charset_map_loaded = 0; + } } return (NILP (count) ? Fcar (positions) : Fnreverse (positions)); ------------------------------------------------------------ revno: 106661 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-12-11 06:20:56 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-12-04 11:19:46 +0000 +++ autogen/configure 2011-12-11 11:20:56 +0000 @@ -8353,9 +8353,9 @@ if test $HAVE_ALSA = yes; then SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" + SAVE_LIBS="$LIBS" CFLAGS="$ALSA_CFLAGS $CFLAGS" - LDFLAGS="$ALSA_LIBS $LDFLAGS" + LIBS="$ALSA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -8398,7 +8398,7 @@ fi CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" + LIBS="$SAVE_LIBS" LIBSOUND="$LIBSOUND $ALSA_LIBS" CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" @@ -11567,9 +11567,9 @@ if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" + SAVE_LIBS="$LIBS" CFLAGS="$SETTINGS_CFLAGS $CFLAGS" - LDFLAGS="$SETTINGS_LIBS $LDFLAGS" + LIBS="$SETTINGS_LIBS $LIBS" for ac_func in g_type_init do : ac_fn_c_check_func "$LINENO" "g_type_init" "ac_cv_func_g_type_init" @@ -11582,7 +11582,7 @@ done CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" + LIBS="$SAVE_LIBS" fi ------------------------------------------------------------ revno: 106660 committer: martin rudalics branch nick: trunk timestamp: Sun 2011-12-11 11:38:11 +0100 message: Fix docstring of other-window. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-10 13:46:25 +0000 +++ lisp/ChangeLog 2011-12-11 10:38:11 +0000 @@ -1,3 +1,7 @@ +2011-12-11 Eric Hanchrow + + * window.el (other-window): Fix docstring. + 2011-12-10 Eli Zaretskii * mail/rmailsum.el (rmail-header-summary): RFC2047 decode the === modified file 'lisp/window.el' --- lisp/window.el 2011-12-09 03:12:38 +0000 +++ lisp/window.el 2011-12-11 10:38:11 +0000 @@ -2204,9 +2204,9 @@ window, so select the selected window. In an interactive call, COUNT is the numeric prefix argument. Return nil. -If the `other-window' parameter of WINDOW is a function and -`ignore-window-parameters' is nil, call that function with the -arguments COUNT and ALL-FRAMES. +If the `other-window' parameter of the selected window is a +function and `ignore-window-parameters' is nil, call that +function with the arguments COUNT and ALL-FRAMES. This function does not select a window whose `no-other-window' window parameter is non-nil. ------------------------------------------------------------ revno: 106659 fixes bug(s): http://debbugs.gnu.org/10100 committer: Jan D. branch nick: trunk timestamp: Sat 2011-12-10 23:53:28 +0100 message: * src/xterm.c (x_term_init): Move call to gdk_window_add_filter before gtk_init. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-10 19:54:45 +0000 +++ src/ChangeLog 2011-12-10 22:53:28 +0000 @@ -1,3 +1,8 @@ +2011-12-10 Jan Djärv + + * xterm.c (x_term_init): Move call to gdk_window_add_filter before + gtk_init (Bug#10100). + 2011-12-10 Eli Zaretskii * xdisp.c (RECORD_MAX_MIN_POS): Use IT->cmp_it.charpos only if === modified file 'src/xterm.c' --- src/xterm.c 2011-12-05 08:55:25 +0000 +++ src/xterm.c 2011-12-10 22:53:28 +0000 @@ -9961,6 +9961,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=563627. */ id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, my_log_handler, NULL); + + /* NULL window -> events for all windows go to our function. + Call before gtk_init so Gtk+ event filters comes after our. */ + gdk_window_add_filter (NULL, event_handler_gdk, NULL); + gtk_init (&argc, &argv2); g_log_remove_handler ("GLib", id); @@ -9970,9 +9975,6 @@ dpy = DEFAULT_GDK_DISPLAY (); - /* NULL window -> events for all windows go to our function */ - gdk_window_add_filter (NULL, event_handler_gdk, NULL); - #if GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION <= 90 /* Load our own gtkrc if it exists. */ { ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.