Now on revision 110380. ------------------------------------------------------------ revno: 110380 fixes bug: http://debbugs.gnu.org/12570 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 19:47:26 -0700 message: * subr.el (read-passwd): Allow C-u to erase entry. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 02:20:36 +0000 +++ lisp/ChangeLog 2012-10-06 02:47:26 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Glenn Morris + + * subr.el (read-passwd): Allow C-u to erase entry. (Bug#12570) + 2012-10-06 Julian Scheid (tiny change) * color.el (color-hsl-to-rgb): Fix incorrect results for === modified file 'lisp/subr.el' --- lisp/subr.el 2012-10-05 05:57:24 +0000 +++ lisp/subr.el 2012-10-06 02:47:26 +0000 @@ -2182,8 +2182,16 @@ (set (make-local-variable 'post-self-insert-hook) nil) (add-hook 'after-change-functions hide-chars-fun nil 'local)) (unwind-protect - (let ((enable-recursive-minibuffers t)) - (read-string prompt nil t default)) ; t = "no history" + (let ((enable-recursive-minibuffers t) + (map minibuffer-local-map) + result) + (define-key map "\C-u" ; bug#12570 + (lambda () (interactive) (delete-minibuffer-contents))) + (setq result + ;; t = no history. + (read-from-minibuffer prompt nil map nil t default)) + (if (and (equal "" result) default) default + result)) (when (buffer-live-p minibuf) (with-current-buffer minibuf ;; Not sure why but it seems that there might be cases where the ------------------------------------------------------------ revno: 110379 fixes bug: http://debbugs.gnu.org/12559 author: Julian Scheid committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 19:20:36 -0700 message: color-hsl-to-rgb fix (tiny change) * lisp/color.el (color-hsl-to-rgb): Fix incorrect results for small and large hue values. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-05 13:42:08 +0000 +++ lisp/ChangeLog 2012-10-06 02:20:36 +0000 @@ -1,3 +1,8 @@ +2012-10-06 Julian Scheid (tiny change) + + * color.el (color-hsl-to-rgb): Fix incorrect results for + small and large hue values. (Bug#12559) + 2012-10-05 Fabián Ezequiel Gallina Enhancements to docstring formatting when filling paragraphs. === modified file 'lisp/color.el' --- lisp/color.el 2012-10-05 07:38:05 +0000 +++ lisp/color.el 2012-10-06 02:20:36 +0000 @@ -113,9 +113,9 @@ (- (+ L S) (* L S)))) (m1 (- (* 2.0 L) m2))) (list - (color-hue-to-rgb m1 m2 (+ H (/ 1.0 3))) + (color-hue-to-rgb m1 m2 (mod (+ H (/ 1.0 3)) 1)) (color-hue-to-rgb m1 m2 H) - (color-hue-to-rgb m1 m2 (- H (/ 1.0 3))))))) + (color-hue-to-rgb m1 m2 (mod (- H (/ 1.0 3)) 1)))))) (defun color-complement-hex (color) "Return the color that is the complement of COLOR, in hexadecimal format." ------------------------------------------------------------ revno: 110378 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 21:42:02 -0400 message: Remove outdated information from ERC manual * doc/misc/erc.texi: Include emacsver.texi, and use EMACSVER rather than ERC version. (Introduction): ERC is distributed with Emacs. (Obtaining ERC, Installation): Remove chapters, no longer relevant. (Getting Started): Simplify. (Getting Help and Reporting Bugs): Refer to general Emacs lists. (History): Mention ERC maintained as part of Emacs now. * doc/misc/Makefile.in ($(buildinfodir)/erc$(INFO_EXT), erc.dvi, erc.pdf): Add dependency on emacsver.texi. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-10-06 01:13:01 +0000 +++ doc/misc/ChangeLog 2012-10-06 01:42:02 +0000 @@ -1,5 +1,15 @@ 2012-10-06 Glenn Morris + * erc.texi: Include emacsver.texi, and use EMACSVER rather than + ERC version. + (Introduction): ERC is distributed with Emacs. + (Obtaining ERC, Installation): Remove chapters, no longer relevant. + (Getting Started): Simplify. + (Getting Help and Reporting Bugs): Refer to general Emacs lists. + (History): Mention ERC maintained as part of Emacs now. + * Makefile.in ($(buildinfodir)/erc$(INFO_EXT), erc.dvi, erc.pdf): + Add dependency on emacsver.texi. + * erc.texi: Remove hand-written node pointers. 2012-10-05 Glenn Morris === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2012-10-01 00:05:20 +0000 +++ doc/misc/Makefile.in 2012-10-06 01:42:02 +0000 @@ -336,12 +336,12 @@ $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi erc : $(buildinfodir)/erc$(INFO_EXT) -$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi +$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi $(emacsdir)/emacsver.texi $(mkinfodir) $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi -erc.dvi: ${srcdir}/erc.texi +erc.dvi: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi -erc.pdf: ${srcdir}/erc.texi +erc.pdf: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi ert : $(buildinfodir)/ert$(INFO_EXT) === modified file 'doc/misc/erc.texi' --- doc/misc/erc.texi 2012-10-06 01:13:01 +0000 +++ doc/misc/erc.texi 2012-10-06 01:42:02 +0000 @@ -3,13 +3,13 @@ @setfilename ../../info/erc @settitle ERC Manual @syncodeindex fn cp +@include emacsver.texi @c %**end of header @copying -This manual is for ERC version 5.3. +This manual is for ERC as distributed with Emacs @value{EMACSVER}. -Copyright @copyright{} 2005-2012 -Free Software Foundation, Inc. +Copyright @copyright{} 2005-2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -56,9 +56,6 @@ @menu * Introduction:: What is ERC? -* Obtaining ERC:: How to get ERC releases and development - versions. -* Installation:: Compiling and installing ERC. * Getting Started:: Quick Start guide to using ERC. * Keystroke Summary:: Keystrokes used in ERC buffers. * Modules:: Available modules for ERC. @@ -75,11 +72,6 @@ @detailmenu --- The Detailed Node Listing --- -Obtaining ERC - -* Releases:: Released versions of ERC. -* Development:: Latest unreleased development changes. - Getting Started * Sample Session:: Example of connecting to the #emacs channel @@ -98,6 +90,7 @@ @chapter Introduction ERC is a powerful, modular, and extensible IRC client for Emacs. +It is distributed with Emacs since version 22.1. It comes with the following capabilities enabled by default. @@ -117,212 +110,13 @@ @end itemize -@node Obtaining ERC -@chapter Obtaining ERC - -@menu -* Releases:: Released versions of ERC. -* Development:: Latest unreleased development changes. -@end menu - -Note that some ERC files are not included with Emacs due to copyright or -dependency issues. If desired, they may be found at the following -locations, or from your local GNU mirror. - -@itemize @bullet -@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.tar.gz} -@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.zip} -@end itemize - -The rest of this chapter may be skipped if you are using the version of -ERC that comes with Emacs. - -@node Releases -@section Releases - -Choose to install a release if you want to minimize risk. - -Errors are corrected in development first. User-visible changes will be -announced on the @email{erc-discuss@@gnu.org} mailing list. -@pxref{Getting Help and Reporting Bugs}. - -@cindex releases, Debian package -@cindex Debian package for ERC -Debian users can get ERC via apt-get. The @file{erc} package is -available in the official Debian repository. - -@cindex releases, from source -Alternatively, you can download the latest release from -@uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror. - -@node Development -@section Development -@cindex development - -Choose the development version if you want to live on the bleeding edge -of ERC development or try out new features before release. - -@cindex git version control system, using -The git version control system allows you to keep up-to-date with the -latest changes to the development version of ERC. It also allows you -to contribute changes (via commits, if you are have developer access to -the repository, or via patches, otherwise). If you would like to -contribute to ERC development, it is highly recommended that you use -git. - -If you are new to git, you might find this tutorial helpful: -@uref{http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html}. - -Downloading ERC with git and staying up-to-date involves the following -steps. - -@enumerate -@item Install git. - -@itemize @bullet -@item Debian and Ubuntu: @kbd{apt-get install git-core}. -@item Windows: @uref{http://git.or.cz/gitwiki/WindowsInstall}. -@item Other operating systems: download, compile, and install the source -from @uref{http://www.kernel.org/pub/software/scm/git/}, or find a git -package for your operating system. -@end itemize - -@item Download the ERC development branch. - -If you have developer access to ERC, do: - -@example -git clone ssh://loginname@@git.sv.gnu.org/srv/git/erc.git -@end example - -otherwise, do: - -@example -git clone git://git.sv.gnu.org/erc.git -@end example - -If you are behind a restrictive firewall, and do not have developer -access, then do the following instead: - -@example -git clone http://git.sv.gnu.org/r/erc.git -@end example - -@item List upstream changes that are missing from your local copy. -Do this whenever you want to see whether new changes have been committed -to ERC. If you wish, you may skip this step and proceed directly to -the ``update'' step. - -@example -# Change to the source directory you are interested in. -cd erc - -# Fetch new changes from the repository, but don't apply them yet -git fetch origin - -# Display log messages for the new changes -git log HEAD..origin -@end example - -``origin'' is git's name for the location where you originally got ERC -from. You can change this location at any time by editing the -@file{.git/config} file in the directory where the ERC source was -placed. - -@cindex updating ERC with git -@item Update to the latest version by pulling in any missing changes. - -@example -cd erc -git pull origin -@end example - -git will show how many files changed, and will provide a visual display -for how many lines were changed in each file. - -@end enumerate - -There are other ways to interact with the ERC repository. - -@itemize -@item Browse git repo: @uref{http://git.sv.gnu.org/gitweb/?p=erc.git} -@item Latest development snapshot: @uref{http://mwolson.org/static/dist/erc-latest.tar.gz} -@item Latest development snapshot (zip file): @uref{http://mwolson.org/static/dist/erc-latest.zip} -@end itemize - -The latest development snapshot can lag behind the git repo by as much -as 20 minutes, but never more than that. - -For further information on committing changes to ERC and performing -development, please consult -@uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment}. - - -@node Installation -@chapter Installation - -ERC may be compiled and installed on your machine. - -This section may be skipped if you are using the version of ERC that -comes with Emacs. - -@subsubheading Compilation - -This is an optional step, since Emacs Lisp source code does not -necessarily have to be byte-compiled. It will yield a speed increase, -though. - -A working copy of Emacs or XEmacs is needed in order to compile ERC. By -default, the program that is installed with the name @command{emacs} -will be used. - -If you want to use the @command{xemacs} binary to perform the -compilation, you would need to edit @file{Makefile} in the top-level -directory as follows. You can put either a full path to an Emacs or -XEmacs binary or just the command name, as long as it is in the -@env{PATH}. - -@example -EMACS = xemacs -SITEFLAG = -no-site-file -@end example - -Running @code{make} should compile the ERC source files in the -@file{lisp} directory. - -@subsubheading Installation - -ERC may be installed into your file hierarchy by doing the following. - -Edit the @file{Makefile} file so that @env{ELISPDIR} points to where you -want the source and compiled ERC files to be installed and -@env{INFODIR} indicates where to put the ERC manual. Of course, you -will want to edit @env{EMACS} and @env{SITEFLAG} as shown in the -Compilation section if you are using XEmacs. - -If you are installing ERC on a Debian system, you might want to change -the value of @env{INSTALLINFO} as specified in @file{Makefile}. - -Run @code{make} as a normal user. - -Run @code{make install} as the root user if you have chosen installation -locations that require this. - @node Getting Started @chapter Getting Started @cindex settings -To use ERC, add the directory containing its files to your -@code{load-path} variable, in your @file{.emacs} file. Then, load ERC -itself. An example follows. - -@lisp -(require 'erc) -@end lisp - -Once ERC is loaded, the command @kbd{M-x erc} will start ERC and -prompt for the server to connect to. +The command @kbd{M-x erc} will start ERC and prompt for the server to +connect to. If you want to place ERC settings in their own file, you can place them in @file{~/.emacs.d/.ercrc.el}, creating it if necessary. @@ -936,31 +730,20 @@ @item @uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the -emacswiki.org page for ERC. Anyone may add tips, hints, or bug -descriptions to it. +emacswiki.org page for ERC. Anyone may add tips, hints, etc. to it. @item -There are several mailing lists for ERC. To subscribe, visit -@uref{http://savannah.gnu.org/mail/?group=erc}. - -The mailing lists are also available on Gmane. -(@url{http://gmane.org/}). Gmane provides additional methods for -accessing the mailing lists, adding content to them, and searching them. - -@enumerate -@item gmane.emacs.erc.announce: Announcements - -@item gmane.emacs.erc.discuss: General discussion - -@item gmane.emacs.erc.cvs: Log messages for changes to the ERC source code - -@end enumerate +You can ask questions about using ERC on the Emacs mailing list, +@uref{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs}. @item You can visit the IRC Freenode channel @samp{#emacs}. Many of the contributors are frequently around and willing to answer your questions. +@item +To report a bug in ERC, use @kbd{M-x report-emacs-bug}. + @end itemize @@ -1027,6 +810,11 @@ We switched to using git for our version control system. +@item 2009+ + +Since about 2009, ERC is no longer developed as a separate project, but +is maintained as part of Emacs. + @end itemize @node Copying ------------------------------------------------------------ revno: 110377 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 21:13:01 -0400 message: * doc/misc/erc.texi: Remove hand-written node pointers. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-10-05 07:38:05 +0000 +++ doc/misc/ChangeLog 2012-10-06 01:13:01 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Glenn Morris + + * erc.texi: Remove hand-written node pointers. + 2012-10-05 Glenn Morris * newsticker.texi (Overview, Requirements, Usage, Configuration): === modified file 'doc/misc/erc.texi' --- doc/misc/erc.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/erc.texi 2012-10-06 01:13:01 +0000 @@ -48,8 +48,7 @@ @contents @ifnottex -@node Top, Introduction, (dir), (dir) -@comment node-name, next, previous, up +@node Top @top ERC @insertcopying @@ -95,8 +94,7 @@ @end detailmenu @end menu -@node Introduction, Obtaining ERC, Top, Top -@comment node-name, next, previous, up +@node Introduction @chapter Introduction ERC is a powerful, modular, and extensible IRC client for Emacs. @@ -119,8 +117,7 @@ @end itemize -@node Obtaining ERC, Installation, Introduction, Top -@comment node-name, next, previous, up +@node Obtaining ERC @chapter Obtaining ERC @menu @@ -140,8 +137,7 @@ The rest of this chapter may be skipped if you are using the version of ERC that comes with Emacs. -@node Releases, Development, Obtaining ERC, Obtaining ERC -@comment node-name, next, previous, up +@node Releases @section Releases Choose to install a release if you want to minimize risk. @@ -159,8 +155,7 @@ Alternatively, you can download the latest release from @uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror. -@node Development, , Releases, Obtaining ERC -@comment node-name, next, previous, up +@node Development @section Development @cindex development @@ -263,8 +258,7 @@ @uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment}. -@node Installation, Getting Started, Obtaining ERC, Top -@comment node-name, next, previous, up +@node Installation @chapter Installation ERC may be compiled and installed on your machine. @@ -315,8 +309,7 @@ locations that require this. -@node Getting Started, Keystroke Summary, Installation, Top -@comment node-name, next, previous, up +@node Getting Started @chapter Getting Started @cindex settings @@ -344,8 +337,7 @@ * Special Features:: Differences from standalone IRC clients @end menu -@node Sample Session, Special Features, Getting Started, Getting Started -@comment node-name, next, previous, up +@node Sample Session @section Sample Session This is an example ERC session which shows how to connect to the #emacs @@ -403,8 +395,7 @@ @end itemize -@node Special Features, , Sample Session, Getting Started -@comment node-name, next, previous, up +@node Special Features @section Special Features ERC has some features that distinguish it from some IRC clients. @@ -478,8 +469,7 @@ @end itemize -@node Keystroke Summary, Modules, Getting Started, Top -@comment node-name, next, previous, up +@node Keystroke Summary @chapter Keys Used in ERC @cindex keystrokes @@ -562,8 +552,7 @@ @end table -@node Modules, Advanced Usage, Keystroke Summary, Top -@comment node-name, next, previous, up +@node Modules @chapter Modules @cindex modules @@ -701,8 +690,7 @@ @c PRE5_4: Document every option of every module in its own subnode -@node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top -@comment node-name, next, previous, up +@node Advanced Usage @chapter Advanced Usage @cindex advanced topics @@ -712,8 +700,7 @@ * Options:: Options that are available for ERC. @end menu -@node Connecting, Sample Configuration, Advanced Usage, Advanced Usage -@comment node-name, next, previous, up +@node Connecting @section Connecting to an IRC Server @cindex connecting @@ -846,8 +833,7 @@ This can be either a string or a function to call. @end defopt -@node Sample Configuration, Options, Connecting, Advanced Usage -@comment node-name, next, previous, up +@node Sample Configuration @section Sample Configuration @cindex configuration, sample @@ -926,8 +912,7 @@ ;; (setq erc-kill-server-buffer-on-quit t) @end lisp -@node Options, , Sample Configuration, Advanced Usage -@comment node-name, next, previous, up +@node Options @section Options @cindex options @@ -939,8 +924,7 @@ @kbd{M-x customize-group erc RET}. -@node Getting Help and Reporting Bugs, History, Advanced Usage, Top -@comment node-name, next, previous, up +@node Getting Help and Reporting Bugs @chapter Getting Help and Reporting Bugs @cindex help, getting @cindex bugs, reporting @@ -980,8 +964,7 @@ @end itemize -@node History, Copying, Getting Help and Reporting Bugs, Top -@comment node-name, next, previous, up +@node History @chapter History @cindex history, of ERC @@ -1046,16 +1029,15 @@ @end itemize -@node Copying, GNU Free Documentation License, History, Top -@comment node-name, next, previous, up +@node Copying +@appendix GNU GENERAL PUBLIC LICENSE @include gpl.texi -@node GNU Free Documentation License, Concept Index, Copying, Top -@comment node-name, next, previous, up +@node GNU Free Documentation License +@appendix GNU Free Documentation License @include doclicense.texi -@node Concept Index, , GNU Free Documentation License, Top -@comment node-name, next, previous, up +@node Concept Index @unnumbered Index @printindex cp ------------------------------------------------------------ revno: 110376 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 21:04:53 -0400 message: Set maintainer of most lisp/erc/*.el files to FSF Ref: http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-10/msg00200.html diff: === modified file 'lisp/erc/erc-autoaway.el' --- lisp/erc/erc-autoaway.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-autoaway.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Jorgen Schaefer +;; Maintainer: FSF ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2012-08-15 16:29:11 +0000 +++ lisp/erc/erc-backend.el 2012-10-06 01:04:53 +0000 @@ -4,6 +4,7 @@ ;; Filename: erc-backend.el ;; Author: Lawrence Mitchell +;; Maintainer: FSF ;; Created: 2004-05-7 ;; Keywords: IRC chat client internet === modified file 'lisp/erc/erc-button.el' --- lisp/erc/erc-button.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-button.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 1996-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: irc, button, url, regexp ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcButton === modified file 'lisp/erc/erc-capab.el' --- lisp/erc/erc-capab.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-capab.el 2012-10-06 01:04:53 +0000 @@ -2,6 +2,10 @@ ;; Copyright (C) 2006-2012 Free Software Foundation, Inc. +;; Maintainer: FSF + +; This file is part of GNU Emacs. + ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or === modified file 'lisp/erc/erc-compat.el' --- lisp/erc/erc-compat.el 2012-02-28 08:17:21 +0000 +++ lisp/erc/erc-compat.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc. ;; Author: Alex Schroeder +;; Maintainer: FSF ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-dcc.el' --- lisp/erc/erc-dcc.el 2012-08-15 16:29:11 +0000 +++ lisp/erc/erc-dcc.el 2012-10-06 01:04:53 +0000 @@ -6,7 +6,7 @@ ;; Author: Ben A. Mesander ;; Noah Friedman ;; Per Persson -;; Maintainer: mlang@delysid.org +;; Maintainer: FSF ;; Keywords: comm, processes ;; Created: 1994-01-23 === modified file 'lisp/erc/erc-ezbounce.el' --- lisp/erc/erc-ezbounce.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-ezbounce.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Andreas Fuchs +;; Maintainer: FSF ;; Keywords: comm ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-fill.el' --- lisp/erc/erc-fill.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-fill.el 2012-10-06 01:04:53 +0000 @@ -4,6 +4,7 @@ ;; Author: Andreas Fuchs ;; Mario Lang +;; Maintainer: FSF ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcFilling ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-goodies.el' --- lisp/erc/erc-goodies.el 2012-06-08 16:39:49 +0000 +++ lisp/erc/erc-goodies.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2001-2012 Free Software Foundation, Inc. ;; Author: Jorgen Schaefer +;; Maintainer: FSF ;; Most code is taken verbatim from erc.el, see there for the original ;; authors. === modified file 'lisp/erc/erc-ibuffer.el' --- lisp/erc/erc-ibuffer.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-ibuffer.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcIbuffer === modified file 'lisp/erc/erc-identd.el' --- lisp/erc/erc-identd.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-identd.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc. ;; Author: John Wiegley +;; Maintainer: FSF ;; Keywords: comm, processes ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-imenu.el' --- lisp/erc/erc-imenu.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-imenu.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcImenu === modified file 'lisp/erc/erc-join.el' --- lisp/erc/erc-join.el 2012-08-22 03:45:51 +0000 +++ lisp/erc/erc-join.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Alex Schroeder +;; Maintainer: FSF ;; Keywords: irc ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin === modified file 'lisp/erc/erc-lang.el' --- lisp/erc/erc-lang.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-lang.el 2012-10-06 01:04:53 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Alex Schroeder -;; Maintainer: Alex Schroeder +;; Maintainer: FSF ;; Version: 1.0.0 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcLang ;; Keywords: comm languages processes === modified file 'lisp/erc/erc-list.el' --- lisp/erc/erc-list.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-list.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: Tom Tromey +;; Maintainer: FSF ;; Version: 0.1 ;; Keywords: comm === modified file 'lisp/erc/erc-log.el' --- lisp/erc/erc-log.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-log.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2003-2012 Free Software Foundation, Inc. ;; Author: Lawrence Mitchell +;; Maintainer: FSF ;; Keywords: IRC, chat, client, Internet, logging ;; Created 2003-04-26 === modified file 'lisp/erc/erc-match.el' --- lisp/erc/erc-match.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-match.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2012 Free Software Foundation, Inc. ;; Author: Andreas Fuchs +;; Maintainer: FSF ;; Keywords: comm, faces ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMatch === modified file 'lisp/erc/erc-menu.el' --- lisp/erc/erc-menu.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-menu.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm, processes, menu ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-netsplit.el' --- lisp/erc/erc-netsplit.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-netsplit.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-networks.el' --- lisp/erc/erc-networks.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-networks.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-notify.el' --- lisp/erc/erc-notify.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-notify.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-page.el' --- lisp/erc/erc-page.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-page.el 2012-10-06 01:04:53 +0000 @@ -2,6 +2,8 @@ ;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. +;; Maintainer: FSF + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/erc/erc-pcomplete.el' --- lisp/erc/erc-pcomplete.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-pcomplete.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Sacha Chua +;; Maintainer: FSF ;; Keywords: comm, convenience ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion === modified file 'lisp/erc/erc-replace.el' --- lisp/erc/erc-replace.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-replace.el 2012-10-06 01:04:53 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Andreas Fuchs -;; Maintainer: Mario Lang (mlang@delysid.org) +;; Maintainer: FSF ;; Keywords: IRC, client, Internet ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-ring.el' --- lisp/erc/erc-ring.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-ring.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Alex Schroeder +;; Maintainer: FSF ;; Keywords: comm ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory === modified file 'lisp/erc/erc-services.el' --- lisp/erc/erc-services.el 2012-04-11 13:43:03 +0000 +++ lisp/erc/erc-services.el 2012-10-06 01:04:53 +0000 @@ -2,6 +2,8 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. +;; Maintainer: FSF + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/erc/erc-sound.el' --- lisp/erc/erc-sound.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-sound.el 2012-10-06 01:04:53 +0000 @@ -2,6 +2,8 @@ ;; Copyright (C) 2002-2003, 2006-2012 Free Software Foundation, Inc. +;; Maintainer: FSF + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/erc/erc-speedbar.el' --- lisp/erc/erc-speedbar.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-speedbar.el 2012-10-06 01:04:53 +0000 @@ -4,6 +4,7 @@ ;; Author: Mario Lang ;; Contributor: Eric M. Ludlam +;; Maintainer: FSF ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-spelling.el' --- lisp/erc/erc-spelling.el 2012-01-19 07:21:25 +0000 +++ lisp/erc/erc-spelling.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2005-2012 Free Software Foundation, Inc. ;; Author: Jorgen Schaefer +;; Maintainer: FSF ;; Keywords: irc ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcSpelling === modified file 'lisp/erc/erc-stamp.el' --- lisp/erc/erc-stamp.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-stamp.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm, processes, timestamp ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp === modified file 'lisp/erc/erc-track.el' --- lisp/erc/erc-track.el 2012-09-17 05:41:04 +0000 +++ lisp/erc/erc-track.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2002-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm, faces ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcChannelTracking === modified file 'lisp/erc/erc-truncate.el' --- lisp/erc/erc-truncate.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-truncate.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Andreas Fuchs +;; Maintainer: FSF ;; Keywords: IRC, chat, client, Internet, logging ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc-xdcc.el' --- lisp/erc/erc-xdcc.el 2012-04-09 13:05:48 +0000 +++ lisp/erc/erc-xdcc.el 2012-10-06 01:04:53 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc. ;; Author: Mario Lang +;; Maintainer: FSF ;; Keywords: comm, processes ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2012-09-25 04:13:02 +0000 +++ lisp/erc/erc.el 2012-10-06 01:04:53 +0000 @@ -9,7 +9,7 @@ ;; Andreas Fuchs (afs@void.at) ;; Gergely Nagy (algernon@midgard.debian.net) ;; David Edmondson (dme@dme.org) -;; Maintainer: Michael Olson (mwolson@gnu.org) +;; Maintainer: FSF ;; Keywords: IRC, chat, client, Internet ;; Version: 5.3 ------------------------------------------------------------ revno: 110375 committer: Paul Eggert branch nick: trunk timestamp: Fri 2012-10-05 17:52:17 -0700 message: * keyboard.c (read_char): Remove unnecessary 'volatile's and label. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-05 11:19:58 +0000 +++ src/ChangeLog 2012-10-06 00:52:17 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Paul Eggert + + * keyboard.c (read_char): Remove unnecessary 'volatile's and label. + 2012-10-05 Eli Zaretskii * w32proc.c (stop_timer_thread): Fix declaration of 'err'. === modified file 'src/keyboard.c' --- src/keyboard.c 2012-10-04 05:52:49 +0000 +++ src/keyboard.c 2012-10-06 00:52:17 +0000 @@ -2283,11 +2283,10 @@ Lisp_Object prev_event, int *used_mouse_menu, EMACS_TIME *end_time) { - volatile Lisp_Object c; + Lisp_Object c; ptrdiff_t jmpcount; sys_jmp_buf local_getcjmp; sys_jmp_buf save_jump; - volatile int key_already_recorded = 0; Lisp_Object tem, save; volatile Lisp_Object previous_echo_area_message; volatile Lisp_Object also_record; @@ -2519,10 +2518,7 @@ return c; /* wrong_kboard_jmpbuf */ if (! NILP (c)) - { - key_already_recorded = 1; - goto non_reread_1; - } + goto exit; } /* Make a longjmp point for quits to use, but don't alter getcjmp just yet. @@ -2850,12 +2846,10 @@ goto wrong_kboard; } - non_reread_1: - /* Buffer switch events are only for internal wakeups so don't show them to the user. Also, don't record a key if we already did. */ - if (BUFFERP (c) || key_already_recorded) + if (BUFFERP (c)) goto exit; /* Process special events within read_char ------------------------------------------------------------ revno: 110374 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 20:44:36 -0400 message: Comment diff: === modified file 'configure.ac' --- configure.ac 2012-09-27 01:06:23 +0000 +++ configure.ac 2012-10-06 00:44:36 +0000 @@ -575,6 +575,7 @@ AC_DEFUN([gl_THREADLIB]) # Initialize gnulib right after choosing the compiler. +dnl Amongst other things, this sets AR and ARFLAGS. gl_EARLY # It's helpful to have C macros available to GDB, so prefer -g3 to -g ------------------------------------------------------------ revno: 110373 fixes bug: http://debbugs.gnu.org/12549 author: Ulrich Mueller committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 20:42:28 -0400 message: Let configure set ar and associated flags * lwlib/Makefile.in (AR, ARFLAGS): * oldXMenu/Makefile.in (AR, ARFLAGS): Get values from configure. diff: === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2012-08-28 16:01:59 +0000 +++ lwlib/ChangeLog 2012-10-06 00:42:28 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Ulrich Müller + + * Makefile.in (AR, ARFLAGS): Get values from configure. + 2012-08-16 Paul Eggert Use ASCII tests for character types. === modified file 'lwlib/Makefile.in' --- lwlib/Makefile.in 2012-08-01 17:55:15 +0000 +++ lwlib/Makefile.in 2012-10-06 00:42:28 +0000 @@ -37,7 +37,8 @@ CPPFLAGS=@CPPFLAGS@ RANLIB=@RANLIB@ -AR = ar cq +AR = @AR@ +ARFLAGS = @ARFLAGS@ LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o MOTIF_OBJS = lwlib-Xm.o @@ -65,7 +66,7 @@ liblw.a: $(OBJS) rm -f $@ - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ ## Generated files in ../src, non-generated in $(srcdir)/../src. === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2012-08-28 16:01:59 +0000 +++ oldXMenu/ChangeLog 2012-10-06 00:42:28 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Ulrich Müller + + * Makefile.in (AR, ARFLAGS): Get values from configure. + 2012-06-26 Paul Eggert * Makefile.in (ALL_CFLAGS): Add -I../lib -I${srcdir}/../lib. === modified file 'oldXMenu/Makefile.in' --- oldXMenu/Makefile.in 2012-06-26 00:39:36 +0000 +++ oldXMenu/Makefile.in 2012-10-06 00:42:28 +0000 @@ -57,8 +57,8 @@ TAGS = etags RM = rm -f RANLIB = @RANLIB@ -# Solaris 2.1 ar doesn't accept the 'l' option. -AR = ar cq +AR = @AR@ +ARFLAGS = @ARFLAGS@ OBJS = Activate.o \ AddPane.o \ @@ -98,7 +98,7 @@ libXMenu11.a: $(OBJS) $(EXTRA) $(RM) $@ - $(AR) $@ $(OBJS) $(EXTRA) + $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) $(RANLIB) $@ Activate.o: Activate.c XMenuInt.h XMenu.h X10.h ------------------------------------------------------------ revno: 110372 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Fri 2012-10-05 10:42:08 -0300 message: Enhancements to docstring formatting when filling paragraphs. * progmodes/python.el (python-fill-docstring-style): Rename from python-fill-string-style. Added new style. (python-fill-string): Use new style. Better checks for docstrings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-05 07:38:05 +0000 +++ lisp/ChangeLog 2012-10-05 13:42:08 +0000 @@ -1,3 +1,11 @@ +2012-10-05 Fabián Ezequiel Gallina + + Enhancements to docstring formatting when filling paragraphs. + * progmodes/python.el (python-fill-docstring-style): Rename from + python-fill-string-style. Added new style. + (python-fill-string): Use new style. Better checks for + docstrings. + 2012-10-05 Glenn Morris * net/newst-treeview.el (newsticker-group-move-feed): Doc fix. === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2012-10-05 05:57:24 +0000 +++ lisp/progmodes/python.el 2012-10-05 13:42:08 +0000 @@ -2290,15 +2290,15 @@ :type 'symbol :group 'python) -(defcustom python-fill-string-style 'pep-257 +(defcustom python-fill-docstring-style 'pep-257 "Style used to fill docstrings. This affects `python-fill-string' behavior with regards to triple quotes positioning. -Possible values are DJANGO, PEP-257, PEP-257-NN, SYMMETRIC and -NIL. A value of NIL won't care about quotes position, will do -what `fill-paragraph' does, any other value may result in one of -the following docstring styles: +Possible values are DJANGO, ONETWO, PEP-257, PEP-257-NN, +SYMMETRIC, and NIL. A value of NIL won't care about quotes +position and will treat docstrings a normal string, any other +value may result in one of the following docstring styles: DJANGO: @@ -2312,6 +2312,17 @@ If processing fails throw ProcessingError. \"\"\" +ONETWO: + + \"\"\"Process foo, return bar.\"\"\" + + \"\"\" + Process foo, return bar. + + If processing fails throw ProcessingError. + + \"\"\" + PEP-257: \"\"\"Process foo, return bar.\"\"\" @@ -2340,9 +2351,16 @@ If processing fails throw ProcessingError. \"\"\"" - :type 'symbol + :type '(choice + (const :tag "Don't format docstrings" nil) + (const :tag "Django's coding standards style." django) + (const :tag "One newline and start and Two at end style." onetwo) + (const :tag "PEP-257 with 2 newlines at end of string." pep-257) + (const :tag "PEP-257 with 1 newline at end of string." pep-257-nn) + (const :tag "Symmetric style." symmetric)) :group 'python - :safe (lambda (val) (memq val '(django pep-257 pep-257-nn symmetric nil)))) + :safe (lambda (val) + (memq val '(django onetwo pep-257 pep-257-nn symmetric nil)))) (defun python-fill-paragraph-function (&optional justify) "`fill-paragraph-function' handling multi-line strings and possibly comments. @@ -2403,28 +2421,28 @@ ;; Docstring styles may vary for oneliners and multi-liners. (> (count-matches "\n" str-start-pos str-end-pos) 0)) (delimiters-style - (case python-fill-string-style + (case python-fill-docstring-style ;; delimiters-style is a cons cell with the form ;; (START-NEWLINES . END-NEWLINES). When any of the sexps ;; is NIL means to not add any newlines for start or end - ;; of docstring. See `python-fill-string-style' for a + ;; of docstring. See `python-fill-docstring-style' for a ;; graphic idea of each style. + (django (cons 1 1)) + (onetwo (and multi-line-p (cons 1 2))) (pep-257 (and multi-line-p (cons nil 2))) (pep-257-nn (and multi-line-p (cons nil 1))) - (django (cons 1 1)) (symmetric (and multi-line-p (cons 1 1))))) (docstring-p (save-excursion ;; Consider docstrings those strings which ;; start on a line by themselves. - (goto-char str-start-pos) - (skip-chars-backward (rx whitespace)) - (= (point) (line-beginning-position)))) + (python-nav-beginning-of-statement) + (and (= (point) str-start-pos)))) (fill-paragraph-function)) (save-restriction (narrow-to-region str-start-pos str-end-pos) (fill-paragraph justify)) (save-excursion - (when (and docstring-p python-fill-string-style) + (when (and docstring-p python-fill-docstring-style) ;; Add the number of newlines indicated by the selected style ;; at the start of the docstring. (goto-char (+ str-start-pos num-quotes)) ------------------------------------------------------------ revno: 110371 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2012-10-05 13:19:58 +0200 message: Fix a typo in a w32proc.c declaration. src/w32proc.c (stop_timer_thread): Fix declaration of 'err'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-05 09:17:17 +0000 +++ src/ChangeLog 2012-10-05 11:19:58 +0000 @@ -1,5 +1,7 @@ 2012-10-05 Eli Zaretskii + * w32proc.c (stop_timer_thread): Fix declaration of 'err'. + * w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so that time stamps of directories could also be changed. Don't request the too broad GENERIC_WRITE, only the more restrictive === modified file 'src/w32proc.c' --- src/w32proc.c 2012-10-02 17:55:29 +0000 +++ src/w32proc.c 2012-10-05 11:19:58 +0000 @@ -404,8 +404,8 @@ struct itimer_data *itimer = (which == ITIMER_REAL) ? &real_itimer : &prof_itimer; int i; - DWORD exit_code = 255; - BOOL status, err; + DWORD err, exit_code = 255; + BOOL status; /* Signal the thread that it should terminate. */ itimer->terminate = 1; ------------------------------------------------------------ revno: 110370 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2012-10-05 11:21:51 +0200 message: Improve commentary for the last commit. diff: === modified file 'src/w32.c' --- src/w32.c 2012-10-05 09:17:17 +0000 +++ src/w32.c 2012-10-05 09:21:51 +0000 @@ -3953,6 +3953,9 @@ /* Need write access to set times. */ fh = CreateFile (name, FILE_WRITE_ATTRIBUTES, + /* If NAME specifies a directory, FILE_SHARE_DELETE + allows other processes to delete files inside it, + while we have the directory open. */ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); if (fh != INVALID_HANDLE_VALUE) ------------------------------------------------------------ revno: 110369 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2012-10-05 11:17:17 +0200 message: Support setting file times of directories on MS-Windows. src/w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so that time stamps of directories could also be changed. Don't request the too broad GENERIC_WRITE, only the more restrictive FILE_WRITE_ATTRIBUTES access rights. src/fileio.c (Fset_file_times): Special-case ignoring errors for directories only on MSDOS, not on MS-Windows. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-05 07:38:05 +0000 +++ src/ChangeLog 2012-10-05 09:17:17 +0000 @@ -1,3 +1,13 @@ +2012-10-05 Eli Zaretskii + + * w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so + that time stamps of directories could also be changed. Don't + request the too broad GENERIC_WRITE, only the more restrictive + FILE_WRITE_ATTRIBUTES access rights. + + * fileio.c (Fset_file_times): Special-case ignoring errors for + directories only on MSDOS, not on MS-Windows. + 2012-10-05 Ikumi Keita (tiny change) * minibuf.c (Fcompleting_read): Doc fix. (Bug#12555) === modified file 'src/fileio.c' --- src/fileio.c 2012-09-30 13:43:47 +0000 +++ src/fileio.c 2012-10-05 09:17:17 +0000 @@ -3034,7 +3034,7 @@ { if (set_file_times (-1, SSDATA (encoded_absname), t, t)) { -#ifdef DOS_NT +#ifdef MSDOS struct stat st; /* Setting times on a directory always fails. */ === modified file 'src/w32.c' --- src/w32.c 2012-10-04 20:07:45 +0000 +++ src/w32.c 2012-10-05 09:17:17 +0000 @@ -3952,8 +3952,9 @@ } /* Need write access to set times. */ - fh = CreateFile (name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, - 0, OPEN_EXISTING, 0, NULL); + fh = CreateFile (name, FILE_WRITE_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); if (fh != INVALID_HANDLE_VALUE) { convert_from_time_t (times->actime, &atime); ------------------------------------------------------------ revno: 110368 fixes bug: http://debbugs.gnu.org/12564 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-10-05 15:48:25 +0800 message: * minibuf.texi (Basic Completion): Clarify list form of completion table. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-10-05 07:38:05 +0000 +++ doc/lispref/ChangeLog 2012-10-05 07:48:25 +0000 @@ -1,3 +1,8 @@ +2012-10-05 Chong Yidong + + * minibuf.texi (Basic Completion): Clarify list form of completion + table (Bug#12564). + 2012-10-05 Bruno Félix Rezende Ribeiro (tiny change) * functions.texi (Function Safety): Copyedit. (Bug#12562) === modified file 'doc/lispref/minibuf.texi' --- doc/lispref/minibuf.texi 2012-09-09 07:09:03 +0000 +++ doc/lispref/minibuf.texi 2012-10-05 07:48:25 +0000 @@ -664,25 +664,22 @@ completions of @var{string} in @var{collection}. @cindex completion table -The @var{collection} argument is called the @dfn{completion table}. -Its value must be a list of strings, an alist whose keys are strings -or symbols, an obarray, a hash table, or a completion function. +@var{collection} is called the @dfn{completion table}. Its value must +be a list of strings or cons cells, an obarray, a hash table, or a +completion function. -Completion compares @var{string} against each of the permissible -completions specified by @var{collection}. If no permissible -completions match, @code{try-completion} returns @code{nil}. If there -is just one matching completion, and the match is exact, it returns +@code{try-completion} compares @var{string} against each of the +permissible completions specified by the completion table. If no +permissible completions match, it returns @code{nil}. If there is +just one matching completion, and the match is exact, it returns @code{t}. Otherwise, it returns the longest initial sequence common to all possible matching completions. -If @var{collection} is an alist (@pxref{Association Lists}), the -permissible completions are the elements of the alist that are either -strings, or conses whose @sc{car} is a string or symbol. -Symbols are converted to strings using @code{symbol-name}. Other -elements of the alist are ignored. (Remember that in Emacs Lisp, the -elements of alists do not @emph{have} to be conses.) In particular, a -list of strings is allowed, even though we usually do not -think of such lists as alists. +If @var{collection} is an list, the permissible completions are +specified by the elements of the list, each of which should be either +a string, or a cons cell whose @sc{car} is either a string or a symbol +(a symbol is converted to a string using @code{symbol-name}). If the +list contains elements of any other type, those are ignored. @cindex obarray in completion If @var{collection} is an obarray (@pxref{Creating Symbols}), the names ------------------------------------------------------------ revno: 110367 [merge] committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 00:38:05 -0700 message: Merge from emacs-24; up to r108160 diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-10-01 02:07:14 +0000 +++ doc/lispref/ChangeLog 2012-10-05 07:38:05 +0000 @@ -1,3 +1,7 @@ +2012-10-05 Bruno Félix Rezende Ribeiro (tiny change) + + * functions.texi (Function Safety): Copyedit. (Bug#12562) + 2012-10-01 Paul Eggert Revert the FOLLOW-SYMLINKS change for file-attributes. === modified file 'doc/lispref/functions.texi' --- doc/lispref/functions.texi 2012-09-30 09:18:38 +0000 +++ doc/lispref/functions.texi 2012-10-05 07:38:05 +0000 @@ -1397,7 +1397,7 @@ @cindex function safety @cindex safety of functions -Some major modes such as SES call functions that are stored in user +Some major modes, such as SES, call functions that are stored in user files. (@inforef{Top, ,ses}, for more information on SES.) User files sometimes have poor pedigrees---you can get a spreadsheet from someone you've just met, or you can get one through email from someone === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-10-01 18:10:29 +0000 +++ doc/misc/ChangeLog 2012-10-05 07:38:05 +0000 @@ -1,3 +1,8 @@ +2012-10-05 Glenn Morris + + * newsticker.texi (Overview, Requirements, Usage, Configuration): + Copyedits. + 2012-10-01 Eric Ludlam * ede.texi (Quick Start, Project Local Variables) === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2012-08-01 23:42:29 +0000 +++ doc/misc/calc.texi 2012-10-05 07:38:05 +0000 @@ -35232,7 +35232,7 @@ Calc is controlled by many variables, most of which can be reset from within Calc. Some variables are less involved with actual -calculation and can be set outside of Calc using Emacs'ss +calculation and can be set outside of Calc using Emacs's customization facilities. These variables are listed below. Typing @kbd{M-x customize-variable RET @var{variable-name} RET} will bring up a buffer in which the variable's value can be redefined. === modified file 'doc/misc/cl.texi' --- doc/misc/cl.texi 2012-05-27 02:30:29 +0000 +++ doc/misc/cl.texi 2012-10-05 07:38:05 +0000 @@ -2087,7 +2087,7 @@ are executed with @var{var} bound to each element of the list in turn. Finally, the @var{result} form (or @code{nil}) is evaluated with @var{var} bound to @code{nil} to produce the result returned by -the loop. Unlike with Emacs'ss built in @code{dolist}, the loop is +the loop. Unlike with Emacs's built in @code{dolist}, the loop is surrounded by an implicit @code{nil} block. @end defspec @@ -2097,7 +2097,7 @@ from zero (inclusive) to @var{count} (exclusive), in turn. Then the @code{result} form is evaluated with @var{var} bound to the total number of iterations that were done (i.e., @code{(max 0 @var{count})}) -to get the return value for the loop form. Unlike with Emacs'ss built in +to get the return value for the loop form. Unlike with Emacs's built in @code{dolist}, the loop is surrounded by an implicit @code{nil} block. @end defspec === modified file 'doc/misc/newsticker.texi' --- doc/misc/newsticker.texi 2012-02-28 08:17:21 +0000 +++ doc/misc/newsticker.texi 2012-10-05 07:34:10 +0000 @@ -69,14 +69,14 @@ @node Overview @chapter Overview -Newsticker provides a newsticker for Emacs. A newsticker is a thing +Newsticker provides a newsticker for Emacs. A newsticker is a thing that asynchronously retrieves headlines from a list of news sites, prepares these headlines for reading, and allows for loading the corresponding articles in a web browser. Headlines consist of a title and (possibly) a small description. They -are contained in "RSS" (RDF Site Summary) or "Atom" files. Newsticker +are contained in ``RSS'' (RDF Site Summary) or ``Atom'' files. Newsticker works with the following RSS formats: @itemize @@ -105,8 +105,9 @@ Newsticker allows for automatic processing of headlines by providing hooks and (sample) functions for automatically downloading images and -enclosed files (as delivered by podcasts, e.g.). +enclosed files (as delivered by, e.g., podcasts). +@ignore @ifhtml Here are screen shots of the @uref{newsticker-1.7.png, version 1.7 (current version)} and some older screen shots: @@ -116,6 +117,7 @@ @uref{newsticker-1.3.png, version 1.3}, @uref{newsticker-1.0.png, version 1.0}. @end ifhtml +@end ignore @node Requirements @chapter Requirements @@ -123,7 +125,7 @@ Newsticker can be used with @uref{http://www.gnu.org/software/emacs/emacs.html, GNU Emacs} version 21.1 or later as well as @uref{http://www.xemacs.org, XEmacs}. It -requires an XML-parser (@file{xml.el}) which is part of GNU Emacs. If +requires an XML-parser (@file{xml.el}), which is part of GNU Emacs. If you are using XEmacs you want to get the @file{net-utils} package which contains @file{xml.el} for XEmacs. @@ -161,11 +163,11 @@ @itemize @item Newsticker's @emph{treeview} uses separate windows for the feeds (in tree form), a list of headlines for the current feed, and -the content of the current headline. Feeds can be placed into groups -which itself can be placed in groups and so on. +the content of the current headline. Feeds can be placed into groups, +which themselves can be placed in groups and so on. @item Newsticker's @emph{plainview} displays all headlines in a -single buffer, called @samp{*newsticker*}. The modeline in the -@samp{*newsticker*} buffer informs whenever new headlines have +single buffer, called @samp{*newsticker*}. The modeline in the +@samp{*newsticker*} buffer informs you whenever new headlines have arrived. @end itemize In both views clicking mouse-button 2 or pressing RET on a headline @@ -175,13 +177,13 @@ @findex newsticker-start-ticker @findex newsticker-stop-ticker The scrolling, or flashing of headlines in the echo area, can be -started with the command @code{newsticker-start-ticker}. It can be +started with the command @code{newsticker-start-ticker}. It can be stopped with @code{newsticker-stop-ticker}. @findex newsticker-start @findex newsticker-stop If you just want to start the periodic download of headlines use the -command @code{newsticker-start}. Calling @code{newsticker-stop} will +command @code{newsticker-start}. Calling @code{newsticker-stop} will stop the periodic download, but will call @code{newsticker-stop-ticker} as well. @@ -189,7 +191,7 @@ @chapter Configuration All Newsticker options are customizable, i.e. they can be changed with -Emacs customization methods: Call the command +Emacs customization methods. Call the command @code{customize-group} and enter @samp{newsticker} for the customization group. @@ -209,7 +211,7 @@ @itemize @item @vindex newsticker-url-list -@code{newsticker-url-list} defines the list of headlines which are +@code{newsticker-url-list} defines the list of headlines that are retrieved. @item @vindex newsticker-retrieval-method @@ -245,11 +247,11 @@ @item @vindex newsticker-new-item-functions @code{newsticker-new-item-functions} allows for automatic -processing of headlines. See `newsticker-download-images', and -`newsticker-download-enclosures' for sample functions. +processing of headlines. See @code{newsticker-download-images}, and +@code{newsticker-download-enclosures} for sample functions. @item @vindex newsticker-plainview-hooks -The subgroup @code{newsticker-plainview-hooks} contains hook which +The subgroup @code{newsticker-plainview-hooks} contains hooks that apply to the plainview reader only. @end itemize @@ -276,7 +278,7 @@ @itemize @item @vindex newsticker-frontend -@code{newsticker-frontend} determines the actual headline reader. The +@code{newsticker-frontend} determines the actual headline reader. The ``plainview'' reader uses a single buffer, the ``treeview'' uses separate buffers and windows. @end itemize === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-10-01 18:10:29 +0000 +++ etc/ChangeLog 2012-10-05 07:38:05 +0000 @@ -1,3 +1,7 @@ +2012-10-05 Douglas Lewan (tiny change) + + * tutorials/TUTORIAL.pt_BR: Fix typo. (Bug#12557) + 2012-10-01 Eric Ludlam * srecode/cc.srt, srecode/ede-autoconf.srt: New files. === modified file 'etc/tutorials/TUTORIAL.pt_BR' --- etc/tutorials/TUTORIAL.pt_BR 2012-01-19 07:21:25 +0000 +++ etc/tutorials/TUTORIAL.pt_BR 2012-10-03 07:17:56 +0000 @@ -46,7 +46,7 @@ Os comandos a seguir são úteis para visualizar telas inteiras C-v Move para tela inteira posterior - M-x Move para tela inteira anterior + M-v Move para tela inteira anterior C-l Limpa a tela e re-mostrá todo o texto, movendo o texto ao redor do cursor para o centro da tela. (Isso é control-L, não control-1.) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-05 05:57:24 +0000 +++ lisp/ChangeLog 2012-10-05 07:38:05 +0000 @@ -1,3 +1,22 @@ +2012-10-05 Glenn Morris + + * net/newst-treeview.el (newsticker-group-move-feed): Doc fix. + + * color.el (color-name-to-rgb, color-rgb-to-hex) + (color-hue-to-rgb, color-hsl-to-rgb, color-rgb-to-hsv) + (color-rgb-to-hsl, color-srgb-to-xyz, color-saturate-hsl) + (color-desaturate-hsl, color-desaturate-name, color-lighten-hsl) + (color-lighten-name, color-darken-hsl, color-darken-name): Doc fixes. + + * emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577) + +2012-10-05 Juanma Barranquero + + * ido.el (ido-directory-too-big-p): Pass dir through file-truename + to get the correct size across symlinks. + + * ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring. + 2012-10-04 Juri Linkov * replace.el (query-replace-interactive): Declare obsolete. === modified file 'lisp/color.el' --- lisp/color.el 2012-08-13 19:10:35 +0000 +++ lisp/color.el 2012-10-05 07:38:05 +0000 @@ -50,17 +50,17 @@ Normally the return value is a list of three floating-point numbers, (RED GREEN BLUE), each between 0.0 and 1.0 inclusive. -Optional arg FRAME specifies the frame where the color is to be +Optional argument FRAME specifies the frame where the color is to be displayed. If FRAME is omitted or nil, use the selected frame. If FRAME cannot display COLOR, return nil." ;; `colors-values' maximum value is either 65535 or 65280 depending on the - ;; display system. So we use a white conversion to get the max value. + ;; display system. So we use a white conversion to get the max value. (let ((valmax (float (car (color-values "#ffffff"))))) (mapcar (lambda (x) (/ x valmax)) (color-values color frame)))) (defun color-rgb-to-hex (red green blue) "Return hexadecimal notation for the color RED GREEN BLUE. -RED GREEN BLUE must be numbers between 0.0 and 1.0 inclusive." +RED, GREEN, and BLUE should be numbers between 0.0 and 1.0, inclusive." (format "#%02x%02x%02x" (* red 255) (* green 255) (* blue 255))) @@ -76,7 +76,7 @@ (defun color-gradient (start stop step-number) "Return a list with STEP-NUMBER colors from START to STOP. The color list builds a color gradient starting at color START to -color STOP. It does not include the START and STOP color in the +color STOP. It does not include the START and STOP color in the resulting list." (let* ((r (nth 0 start)) (g (nth 1 start)) @@ -93,8 +93,8 @@ (nreverse result))) (defun color-hue-to-rgb (v1 v2 h) - "Compute hue from V1 and V2 H. Internally used by -`color-hsl-to-rgb'." + "Compute hue from V1 and V2 H. +Used internally by `color-hsl-to-rgb'." (cond ((< h (/ 1.0 6)) (+ v1 (* (- v2 v1) h 6.0))) ((< h 0.5) v2) @@ -102,13 +102,10 @@ (t v1))) (defun color-hsl-to-rgb (H S L) - "Convert H S L (HUE, SATURATION, LUMINANCE) , where HUE is in -radians and both SATURATION and LUMINANCE are between 0.0 and -1.0, inclusive to their RGB representation. - -Return a list (RED, GREEN, BLUE) which each be numbers between -0.0 and 1.0, inclusive." - + "Convert hue, saturation and luminance to their RGB representation. +H, S, and L should each be numbers between 0.0 and 1.0, inclusive. +Return a list (RED GREEN BLUE), where each element is between 0.0 and 1.0, +inclusive." (if (= S 0.0) (list L L L) (let* ((m2 (if (<= L 0.5) @@ -125,9 +122,9 @@ (apply 'color-rgb-to-hex (color-complement color))) (defun color-rgb-to-hsv (red green blue) - "Convert RED, GREEN, and BLUE color components to HSV. + "Convert RGB color components to HSV. RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0, -inclusive. Return a list (HUE, SATURATION, VALUE), where HUE is +inclusive. Return a list (HUE SATURATION VALUE), where HUE is in radians and both SATURATION and VALUE are between 0.0 and 1.0, inclusive." (let* ((r (float red)) @@ -155,13 +152,10 @@ (/ max 255.0))))) (defun color-rgb-to-hsl (red green blue) - "Convert RED GREEN BLUE colors to their HSL representation. + "Convert RGB colors to their HSL representation. RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0, -inclusive. - -Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians -and both SATURATION and LUMINANCE are between 0.0 and 1.0, -inclusive." +inclusive. Return a list (HUE SATURATION LUMINANCE), where +each element is between 0.0 and 1.0, inclusive." (let* ((r red) (g green) (b blue) @@ -187,7 +181,7 @@ (defun color-srgb-to-xyz (red green blue) "Convert RED GREEN BLUE colors from the sRGB color space to CIE XYZ. -RED, BLUE and GREEN must be between 0 and 1, inclusive." +RED, GREEN and BLUE should be between 0.0 and 1.0, inclusive." (let ((r (if (<= red 0.04045) (/ red 12.95) (expt (/ (+ red 0.055) 1.055) 2.4))) @@ -225,44 +219,44 @@ (defun color-xyz-to-lab (X Y Z &optional white-point) "Convert CIE XYZ to CIE L*a*b*. WHITE-POINT specifies the (X Y Z) white point for the -conversion. If omitted or nil, use `color-d65-xyz'." +conversion. If omitted or nil, use `color-d65-xyz'." (pcase-let* ((`(,Xr ,Yr ,Zr) (or white-point color-d65-xyz)) (xr (/ X Xr)) - (yr (/ Y Yr)) - (zr (/ Z Zr)) - (fx (if (> xr color-cie-ε) - (expt xr (/ 1 3.0)) - (/ (+ (* color-cie-κ xr) 16) 116.0))) - (fy (if (> yr color-cie-ε) - (expt yr (/ 1 3.0)) - (/ (+ (* color-cie-κ yr) 16) 116.0))) - (fz (if (> zr color-cie-ε) - (expt zr (/ 1 3.0)) - (/ (+ (* color-cie-κ zr) 16) 116.0)))) - (list - (- (* 116 fy) 16) ; L - (* 500 (- fx fy)) ; a + (yr (/ Y Yr)) + (zr (/ Z Zr)) + (fx (if (> xr color-cie-ε) + (expt xr (/ 1 3.0)) + (/ (+ (* color-cie-κ xr) 16) 116.0))) + (fy (if (> yr color-cie-ε) + (expt yr (/ 1 3.0)) + (/ (+ (* color-cie-κ yr) 16) 116.0))) + (fz (if (> zr color-cie-ε) + (expt zr (/ 1 3.0)) + (/ (+ (* color-cie-κ zr) 16) 116.0)))) + (list + (- (* 116 fy) 16) ; L + (* 500 (- fx fy)) ; a (* 200 (- fy fz))))) ; b (defun color-lab-to-xyz (L a b &optional white-point) "Convert CIE L*a*b* to CIE XYZ. WHITE-POINT specifies the (X Y Z) white point for the -conversion. If omitted or nil, use `color-d65-xyz'." +conversion. If omitted or nil, use `color-d65-xyz'." (pcase-let* ((`(,Xr ,Yr ,Zr) (or white-point color-d65-xyz)) (fy (/ (+ L 16) 116.0)) - (fz (- fy (/ b 200.0))) - (fx (+ (/ a 500.0) fy)) - (xr (if (> (expt fx 3.0) color-cie-ε) - (expt fx 3.0) - (/ (- (* fx 116) 16) color-cie-κ))) - (yr (if (> L (* color-cie-κ color-cie-ε)) - (expt (/ (+ L 16) 116.0) 3.0) - (/ L color-cie-κ))) - (zr (if (> (expt fz 3) color-cie-ε) - (expt fz 3.0) - (/ (- (* 116 fz) 16) color-cie-κ)))) - (list (* xr Xr) ; X - (* yr Yr) ; Y + (fz (- fy (/ b 200.0))) + (fx (+ (/ a 500.0) fy)) + (xr (if (> (expt fx 3.0) color-cie-ε) + (expt fx 3.0) + (/ (- (* fx 116) 16) color-cie-κ))) + (yr (if (> L (* color-cie-κ color-cie-ε)) + (expt (/ (+ L 16) 116.0) 3.0) + (/ L color-cie-κ))) + (zr (if (> (expt fz 3) color-cie-ε) + (expt fz 3.0) + (/ (- (* 116 fz) 16) color-cie-κ)))) + (list (* xr Xr) ; X + (* yr Yr) ; Y (* zr Zr)))) ; Z (defun color-srgb-to-lab (red green blue) @@ -349,17 +343,14 @@ (min 1.0 (max 0.0 value))) (defun color-saturate-hsl (H S L percent) - "Return a color PERCENT more saturated than the one defined in -H S L color-space. - -Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians -and both SATURATION and LUMINANCE are between 0.0 and 1.0, -inclusive." + "Make a color more saturated by a specified amount. +Given a color defined in terms of hue, saturation, and luminance +\(arguments H, S, and L), return a color that is PERCENT more +saturated. Returns a list (HUE SATURATION LUMINANCE)." (list H (color-clamp (+ S (/ percent 100.0))) L)) (defun color-saturate-name (name percent) - "Short hand to saturate COLOR by PERCENT. - + "Make a color with a specified NAME more saturated by PERCENT. See `color-saturate-hsl'." (apply 'color-rgb-to-hex (apply 'color-hsl-to-rgb @@ -370,32 +361,26 @@ (list percent)))))) (defun color-desaturate-hsl (H S L percent) - "Return a color PERCENT less saturated than the one defined in -H S L color-space. - -Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians -and both SATURATION and LUMINANCE are between 0.0 and 1.0, -inclusive." + "Make a color less saturated by a specified amount. +Given a color defined in terms of hue, saturation, and luminance +\(arguments H, S, and L), return a color that is PERCENT less +saturated. Returns a list (HUE SATURATION LUMINANCE)." (color-saturate-hsl H S L (- percent))) (defun color-desaturate-name (name percent) - "Short hand to desaturate COLOR by PERCENT. - + "Make a color with a specified NAME less saturated by PERCENT. See `color-desaturate-hsl'." (color-saturate-name name (- percent))) (defun color-lighten-hsl (H S L percent) - "Return a color PERCENT lighter than the one defined in -H S L color-space. - -Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians -and both SATURATION and LUMINANCE are between 0.0 and 1.0, -inclusive." + "Make a color lighter by a specified amount. +Given a color defined in terms of hue, saturation, and luminance +\(arguments H, S, and L), return a color that is PERCENT lighter. +Returns a list (HUE SATURATION LUMINANCE)." (list H S (color-clamp (+ L (/ percent 100.0))))) (defun color-lighten-name (name percent) - "Short hand to saturate COLOR by PERCENT. - + "Make a color with a specified NAME lighter by PERCENT. See `color-lighten-hsl'." (apply 'color-rgb-to-hex (apply 'color-hsl-to-rgb @@ -406,17 +391,14 @@ (list percent)))))) (defun color-darken-hsl (H S L percent) - "Return a color PERCENT darker than the one defined in -H S L color-space. - -Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians -and both SATURATION and LUMINANCE are between 0.0 and 1.0, -inclusive." + "Make a color darker by a specified amount. +Given a color defined in terms of hue, saturation, and luminance +\(arguments H, S, and L), return a color that is PERCENT darker. +Returns a list (HUE SATURATION LUMINANCE)." (color-lighten-hsl H S L (- percent))) (defun color-darken-name (name percent) - "Short hand to saturate COLOR by PERCENT. - + "Make a color with a specified NAME darker by PERCENT. See `color-darken-hsl'." (color-lighten-name name (- percent))) === modified file 'lisp/emacs-lisp/timer.el' --- lisp/emacs-lisp/timer.el 2012-10-05 05:57:24 +0000 +++ lisp/emacs-lisp/timer.el 2012-10-05 07:38:05 +0000 @@ -450,7 +450,7 @@ (with-timeout-timers (cons -with-timeout-timer- with-timeout-timers))) (unwind-protect - ,@body + (progn ,@body) (cancel-timer -with-timeout-timer-)))))) ;; It is tempting to avoid the `if' altogether and instead run ;; timeout-forms in the timer, just before throwing `timeout'. === modified file 'lisp/files.el' --- lisp/files.el 2012-10-01 02:07:14 +0000 +++ lisp/files.el 2012-10-05 07:38:05 +0000 @@ -22,7 +22,7 @@ ;;; Commentary: -;; Defines most of Emacs'ss file- and directory-handling functions, +;; Defines most of Emacs's file- and directory-handling functions, ;; including basic file visiting, backup generation, link handling, ;; ITS-id version control, load- and write-hook handling, and the like. === modified file 'lisp/ido.el' --- lisp/ido.el 2012-10-05 05:57:24 +0000 +++ lisp/ido.el 2012-10-05 07:38:05 +0000 @@ -1720,7 +1720,7 @@ (ido-final-slash dir) (not (ido-is-unc-host dir)) (file-directory-p dir) - (> (nth 7 (file-attributes dir)) ido-max-directory-size)))) + (> (nth 7 (file-attributes (file-truename dir))) ido-max-directory-size)))) (defun ido-set-current-directory (dir &optional subdir no-merge) ;; Set ido's current directory to DIR or DIR/SUBDIR === modified file 'lisp/net/newst-treeview.el' --- lisp/net/newst-treeview.el 2012-09-25 04:13:02 +0000 +++ lisp/net/newst-treeview.el 2012-10-05 07:38:05 +0000 @@ -1722,7 +1722,7 @@ (defun newsticker-group-move-feed (name group-name &optional no-update) "Move feed NAME to group GROUP-NAME. -Update teeview afterwards unless NO-UPDATE is non-nil." +Update treeview afterwards unless NO-UPDATE is non-nil." (interactive (let ((completion-ignore-case t)) (list (completing-read "Feed Name: " === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-04 20:07:45 +0000 +++ src/ChangeLog 2012-10-05 07:38:05 +0000 @@ -1,3 +1,7 @@ +2012-10-05 Ikumi Keita (tiny change) + + * minibuf.c (Fcompleting_read): Doc fix. (Bug#12555) + 2012-10-04 Eli Zaretskii * w32.c (utime): Test for INVALID_HANDLE_VALUE, not for NULL, to === modified file 'src/minibuf.c' --- src/minibuf.c 2012-09-22 15:24:26 +0000 +++ src/minibuf.c 2012-10-05 07:38:05 +0000 @@ -1703,7 +1703,7 @@ functions, which use one-indexing for POSITION.) This feature is deprecated--it is best to pass nil for INITIAL-INPUT and supply the default value DEF instead. The user can yank the default value into - the minibuffer easily using \\[next-history-element]. + the minibuffer easily using \\\\[next-history-element]. HIST, if non-nil, specifies a history list and optionally the initial position in the list. It can be a symbol, which is the history list ------------------------------------------------------------ revno: 110366 committer: Paul Eggert branch nick: trunk timestamp: Thu 2012-10-04 22:57:24 -0700 message: Spelling fixes. diff: === modified file 'admin/grammars/srecode-template.wy' --- admin/grammars/srecode-template.wy 2012-10-01 18:10:29 +0000 +++ admin/grammars/srecode-template.wy 2012-10-05 05:57:24 +0000 @@ -212,7 +212,7 @@ ; dictionary-entry-list - : ;; emtpy + : ;; empty () | dictionary-entry-list dictionary-entry (append $1 $2) === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2012-09-30 09:18:38 +0000 +++ doc/emacs/display.texi 2012-10-05 05:57:24 +0000 @@ -1065,7 +1065,7 @@ Type @kbd{M-x delete-trailing-whitespace} to delete all trailing whitespace. This command deletes all extra spaces at the end of each line in the buffer, and all empty lines at the end of the buffer; to -ignore the latter, change the varaible @code{delete-trailing-lines} to +ignore the latter, change the variable @code{delete-trailing-lines} to @code{nil}. If the region is active, the command instead deletes extra spaces at the end of each line in the region. === modified file 'doc/lispref/commands.texi' --- doc/lispref/commands.texi 2012-09-30 09:18:38 +0000 +++ doc/lispref/commands.texi 2012-10-05 05:57:24 +0000 @@ -1952,7 +1952,7 @@ @defun posnp object This function returns non-@code{nil} if @var{object} is a mouse -oposition list, in either of the formats documented in @ref{Click +position list, in either of the formats documented in @ref{Click Events}); and @code{nil} otherwise. @end defun === modified file 'doc/lispref/errors.texi' --- doc/lispref/errors.texi 2012-09-30 09:18:38 +0000 +++ doc/lispref/errors.texi 2012-10-05 05:57:24 +0000 @@ -148,7 +148,7 @@ @ignore @c Not actually used for anything? Probably definition should be removed. @item protected-field -The message is @samp{Attempt to modify a protected fiel. +The message is @samp{Attempt to modify a protected file}. @end ignore @item scan-error @@ -205,7 +205,7 @@ The message is @code{Arithmetic range error}. @item singularity-error -The mssage is @samp{Arithmetic singularity error}. This is a +The message is @samp{Arithmetic singularity error}. This is a subcategory of @code{domain-error}. @item underflow-error === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2012-10-01 18:10:29 +0000 +++ doc/misc/ede.texi 2012-10-05 05:57:24 +0000 @@ -302,7 +302,7 @@ . a myprogram RET @end example -Note that these promps often have completion, so you can just press +Note that these prompts often have completion, so you can just press @kbd{TAB} to complete the name @file{myprogram}. If you had many files to add to the same target, you could mark them @@ -785,7 +785,7 @@ An arduino project of type @samp{ede-arduino-project} will read your @file{~/.arduino/preferences.txt} file, and identify your sketches. You will still need the Arduino IDE to set up your preferences and -locate your arduino. After quiting the IDE, Emacs will be able to +locate your arduino. After quitting the IDE, Emacs will be able to find your sketches, compile them, and upload them to your arduino. If you have the @file{arduino} command on your path, @ede{} will be @@ -1169,14 +1169,14 @@ @table @code @item project-am -Autmake project which reads existing Automake files. +Automake project which reads existing Automake files. @item ede-proj-project This project type will create @file{Makefiles}, or @file{Makefile.am} files to compile your project. @item ede-linux This project type will detect linux source trees. @item ede-emacs -This proejct will detect an Emacs source tree. +This project will detect an Emacs source tree. @end table There are several other project types as well. @@ -1291,7 +1291,7 @@ @code{ede-toplevel-project}. If this hasn't already been discovered, the directories as scanned upward one at a time until a directory with no project is found. The last found project becomes the project -root. If the ofund instance of @code{ede-project-autoload} has a +root. If the found instance of @code{ede-project-autoload} has a valid @code{proj-root} slot value, then that function is called instead of scanning the project by hand. Some project types have a short-cut for determining the root of a project, so this comes in handy. @@ -3331,7 +3331,7 @@ @end deffn @deffn Method ede-proj-flush-autoconf :AFTER this -Flush the configure file (current buffer) to accomodate @var{THIS}. +Flush the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-buffer-mine :AFTER this buffer @@ -3920,7 +3920,7 @@ @end deffn @deffn Method project-compile-target-command :AFTER this -Default target t- use when compling a texinfo file. +Default target to use when compiling a texinfo file. @end deffn @deffn Method ede-documentation :AFTER this === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2012-10-01 18:10:29 +0000 +++ doc/misc/eieio.texi 2012-10-05 05:57:24 +0000 @@ -595,7 +595,7 @@ @item :depth-first Search for methods in the class hierarchy in a depth first order. @item :c3 -Searches for methods in in a learnarized way that most closely matches +Searches for methods in in a linearized way that most closely matches what CLOS does when a monotonic class structure is defined. @end table @@ -1010,7 +1010,7 @@ @item :depth-first Search for methods in the class hierarchy in a depth first order. @item :c3 -Searches for methods in in a learnarized way that most closely matches +Searches for methods in in a linearized way that most closely matches what CLOS does when CLOS when a monotonic class structure is defined. This is derived from the Dylan language documents by @@ -1408,8 +1408,8 @@ Read a persistent object from @var{filename}, and return it. Signal an error if the object in @var{FILENAME} is not a constructor for @var{CLASS}. Optional @var{allow-subclass} says that it is ok for -@code{eieio-peristent-read} to load in subclasses of class instead of -being pendantic." +@code{eieio-persistent-read} to load in subclasses of class instead of +being pedantic. @end defun @node eieio-named @@ -1564,9 +1564,9 @@ @deffn Command eieiodoc-class class indexstring &optional skiplist -This will start at the current point, and created an indented menu of +This will start at the current point, and create an indented menu of all the child classes of, and including @var{class}, but skipping any -classes that might be in @var{skiplist} It will then create nodes for +classes that might be in @var{skiplist}. It will then create nodes for all these classes, subsection headings, and indexes. Each class will be indexed using the texinfo labeled index @@ -1585,7 +1585,7 @@ Next, an inheritance tree will be created listing all parents of that section's class. -Then,all the slots will be expanded in tables, and described +Then, all the slots will be expanded in tables, and described using the documentation strings from the code. Default values will also be displayed. Only those slots with @code{:initarg} specified will be expanded, others will be hidden. If a slot is inherited from a parent, === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2012-09-30 15:14:59 +0000 +++ doc/misc/org.texi 2012-10-05 05:57:24 +0000 @@ -947,7 +947,7 @@ Installing Info files is system dependent, because of differences in the @file{install-info} program. The Info documentation is installed together with the rest of Org mode. If you don't install Org mode, it is possible to -install the Info documentation seperately (you need to have +install the Info documentation separately (you need to have install-info@footnote{The output from install-info (if any) is system dependent. In particular Debian and its derivatives use two different versions of install-info and you may see the message: @@ -2671,13 +2671,13 @@ @cindex Lisp forms, as table formulas It is also possible to write a formula in Emacs Lisp. This can be useful -for string manipulation and control structures, if Calc's functionality is -not enough. +for string manipulation and control structures, if Calc's functionality is +not enough. If a formula starts with a single-quote followed by an opening parenthesis, then it is evaluated as a Lisp form. The evaluation should return either a string or a number. Just as with @file{calc} formulas, you can specify modes -and a printf format after a semicolon. +and a printf format after a semicolon. With Emacs Lisp forms, you need to be conscious about the way field references are interpolated into the form. By default, a reference will be @@ -6114,7 +6114,7 @@ them with @kbd{S-@key{cursor}} keys, the update is automatic. @orgcmd{C-S-@key{up/down},org-clock-timestamps-up/down} On @code{CLOCK} log lines, increase/decrease both timestamps so that the -clock duration keeps the same. +clock duration keeps the same. @orgcmd{S-M-@key{up/down},org-timestamp-up/down} On @code{CLOCK} log lines, increase/decrease the timestamp at point and the one of the previous (or the next clock) timestamp by the same duration. @@ -16556,7 +16556,7 @@ Finally, Org writes the file @file{index.org}, containing links to all other files. @i{MobileOrg} first reads this file from the server, and then downloads all agendas and Org files listed in it. To speed up the download, -MobileOrg will only read files whose checksums@footnote{Checksums are stored +MobileOrg will only read files whose checksums@footnote{Checksums are stored automatically in the file @file{checksums.dat}} have changed. @node Pulling from MobileOrg, , Pushing to MobileOrg, MobileOrg @@ -16704,7 +16704,7 @@ opened the doors for many new ideas and features. @item Jambunathan K -Jambunathan contributed the ODT exporter, definitly a killer feature of +Jambunathan contributed the ODT exporter, definitely a killer feature of Org mode. He also contributed the new HTML exporter, which is another core feature of Org. Here too, I knew I could rely on him to fix bugs in these areas and to patiently explain the users what was the problems and solutions. @@ -16712,7 +16712,7 @@ @item Achim Gratz Achim rewrote the building process of Org, turning some @emph{ad hoc} tools into a flexible and conceptually clean process. He patiently coped with the -many hicups that such a change can create for users. +many hiccups that such a change can create for users. @item Nick Dokos The Org mode mailing list would not be such a nice place without Nick, who === modified file 'etc/ORG-NEWS' --- etc/ORG-NEWS 2012-09-30 15:14:59 +0000 +++ etc/ORG-NEWS 2012-10-05 05:57:24 +0000 @@ -65,12 +65,12 @@ *** Org Element - =org-element.el= is a toolbox for parsing and analysing "elements" + =org-element.el= is a toolbox for parsing and analyzing "elements" in an Org-mode buffer. This has been written by Nicolas Goaziou and has been tested for quite some time. It is now part of Org's core and many core functions rely on this package. - Two functions might be particularily handy for users: + Two functions might be particularly handy for users: =org-element-at-point= and =org-element-context=. See the docstrings for more details. @@ -539,7 +539,7 @@ **** =:results org= now put results in a =#+BEGIN_SRC org= block =:results org= used to put results in a =#+BEGIN_ORG= block but it now puts -results in a =#+BEGIN_SRC org= block, wich comma-escaped lines. +results in a =#+BEGIN_SRC org= block, with comma-escaped lines. =#+BEGIN_ORG= blocks are obsolete. @@ -552,7 +552,7 @@ **** New menu entry for [[doc::org-refile][org-refile]] **** Allow capturing to encrypted entries -If you capture to an encrypted entry, it will be decrpyted before +If you capture to an encrypted entry, it will be decrypted before inserting the template then re-encrypted after finalizing the capture. **** Inactive timestamps are now handled in tables @@ -932,7 +932,7 @@ **** org-gnus.el now allows link creation from messages - You can now create links from messages. This is particularily + You can now create links from messages. This is particularly useful when the user wants to stored messages that he sends, for later check. Thanks to Ulf Stegemann for the patch. @@ -1115,7 +1115,7 @@ *** Completion -**** In-buffer completion is now done using John Wiegleys pcomplete.el +**** In-buffer completion is now done using John Wiegley's pcomplete.el Thanks to John Wiegley for much of this code. === modified file 'lib/stdlib.in.h' --- lib/stdlib.in.h 2012-10-04 07:15:42 +0000 +++ lib/stdlib.in.h 2012-10-05 05:57:24 +0000 @@ -458,7 +458,7 @@ /* Return the pathname of the pseudo-terminal slave associated with the master FD is open on, or NULL on errors. */ # if @REPLACE_PTSNAME@ -# if !(defined __cplusplus && defined GNULIB_NAMESPCE) +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef ptsname # define ptsname rpl_ptsname # endif === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-04 19:28:11 +0000 +++ lisp/ChangeLog 2012-10-05 05:57:24 +0000 @@ -8347,7 +8347,8 @@ 2012-03-18 Leo Liu - * net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with prefix. + * net/rcirc.el (rcirc-cmd-quit): Allow quitting all servers with + prefix. 2012-03-17 Eli Zaretskii === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2012-01-19 07:21:25 +0000 +++ lisp/ChangeLog.10 2012-10-05 05:57:24 +0000 @@ -5492,7 +5492,7 @@ 2003-02-14 Dave Love - * international/code-pages.el: Undo `Trailing whitepace deleted.' + * international/code-pages.el: Undo `Trailing whitespace deleted.' damage. (cp1125, mik): Nullify mime-charset. === modified file 'lisp/cedet/ede.el' --- lisp/cedet/ede.el 2012-10-02 05:02:52 +0000 +++ lisp/cedet/ede.el 2012-10-05 05:57:24 +0000 @@ -1358,13 +1358,13 @@ (defmethod ede-system-include-path ((this ede-project)) "Get the system include path used by project THIS." nil) - + (defmethod ede-system-include-path ((this ede-target)) "Get the system include path used by project THIS." nil) (defmethod ede-source-paths ((this ede-project) mode) - "Get the base to all source trees in the current projet for MODE. + "Get the base to all source trees in the current project for MODE. For example, /src for sources of c/c++, Java, etc, and /doc for doc sources." nil) === modified file 'lisp/cedet/ede/auto.el' --- lisp/cedet/ede/auto.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/ede/auto.el 2012-10-05 05:57:24 +0000 @@ -68,7 +68,7 @@ ;; Add new types of dirmatches here. - ;; Error for wierd stuff + ;; Error for weird stuff (t (error "Unknown dirmatch type."))))) @@ -285,7 +285,7 @@ ;; If this file DOES NOT match dirmatch, we set the callfcn ;; to nil, meaning don't load the ede support file for this ;; type of project. If it does match, we will load the file - ;; and use a more accurate programatic match from there. + ;; and use a more accurate programmatic match from there. (unless (ede-project-dirmatch-p file dirmatch) (setq callfcn nil)))) ;; Call into the project support file for a match. === modified file 'lisp/cedet/ede/autoconf-edit.el' --- lisp/cedet/ede/autoconf-edit.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/ede/autoconf-edit.el 2012-10-05 05:57:24 +0000 @@ -165,7 +165,7 @@ (setq param (substring param (match-end 0)))) (when (string-match "\\s-*\\]?\\s-*\\'" param) (setq param (substring param 0 (match-beginning 0)))) - ;; Look for occurances of backslash newline + ;; Look for occurrences of backslash newline (while (string-match "\\s-*\\\\\\s-*\n\\s-*" param) (setq param (replace-match " " t t param))) param) === modified file 'lisp/cedet/inversion.el' --- lisp/cedet/inversion.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/inversion.el 2012-10-05 05:57:24 +0000 @@ -348,7 +348,7 @@ ;;;###autoload (defun inversion-require-emacs (emacs-ver xemacs-ver sxemacs-ver) - "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACE-ver. + "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver. Only checks one based on which kind of Emacs is being run." (let ((err (inversion-test 'emacs (cond ((featurep 'sxemacs) === modified file 'lisp/cedet/semantic/bovine/c.el' --- lisp/cedet/semantic/bovine/c.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/bovine/c.el 2012-10-05 05:57:24 +0000 @@ -390,7 +390,7 @@ ;; can then interpret. (let ((stream (semantic-lex-spp-symbol-stream spp-symbol))) (cond - ;; Empyt string means defined, so t. + ;; Empty string means defined, so t. ((null stream) t) ;; A list means a parsed macro stream. ((listp stream) @@ -515,7 +515,7 @@ ;; should be skipped. (semantic-c-skip-conditional-section) (setq semantic-lex-end-point (point)) - + ;; @TODO -somewhere around here, we also need to skip ;; other sections of the conditional. === modified file 'lisp/cedet/semantic/complete.el' --- lisp/cedet/semantic/complete.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/complete.el 2012-10-05 05:57:24 +0000 @@ -1555,7 +1555,7 @@ extended set. Quiet: Only show completions when we have narrowed all -posibilities down to a maximum of +possibilities down to a maximum of `semantic-displayor-tooltip-initial-max-tags' tags. Pressing TAB multiple times will also show completions. @@ -2239,4 +2239,3 @@ ;; End: ;;; semantic/complete.el ends here - === modified file 'lisp/cedet/semantic/db-global.el' --- lisp/cedet/semantic/db-global.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/db-global.el 2012-10-05 05:57:24 +0000 @@ -48,7 +48,7 @@ Two sanity checks are performed to assure (a) that GNU global program exists and (b) that the GNU global program version is compatibility with the database version. If optional NOERROR is nil, then an error may be signalled on version -mismatch. If NOERROR is not nil, then no error will be signlled. Instead +mismatch. If NOERROR is not nil, then no error will be signaled. Instead return value will indicate success or failure with non-nil or nil respective values." (interactive === modified file 'lisp/cedet/semantic/db-typecache.el' --- lisp/cedet/semantic/db-typecache.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/db-typecache.el 2012-10-05 05:57:24 +0000 @@ -584,7 +584,7 @@ (dolist (P path) (condition-case nil (oset P pointmax nil) - ;; Pointmax may not exist for all tables disovered in the + ;; Pointmax may not exist for all tables discovered in the ;; path. (error nil)) (semantic-reset (semanticdb-get-typecache P))))) === modified file 'lisp/cedet/semantic/decorate/include.el' --- lisp/cedet/semantic/decorate/include.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/decorate/include.el 2012-10-05 05:57:24 +0000 @@ -589,7 +589,7 @@ on disk, but a database table of tags has been associated with it. This means that the include will still be used to find tags for -searches, but you connot visit this include.\n\n") +searches, but you cannot visit this include.\n\n") (princ "This Header is now represented by the following database table:\n\n ") (princ (object-print table)) ))) === modified file 'lisp/cedet/semantic/fw.el' --- lisp/cedet/semantic/fw.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/fw.el 2012-10-05 05:57:24 +0000 @@ -85,7 +85,7 @@ c))) event)) (defun semantic-popup-menu (menu) - "Blockinig version of `popup-menu'" + "Blocking version of `popup-menu'" (popup-menu menu) ;; Wait... (while (popup-up-p) (dispatch-event (next-event)))) @@ -139,7 +139,7 @@ 'run-mode-hooks 'run-hooks)) - ;; Fancy compat useage now handled in cedet-compat + ;; Fancy compat usage now handled in cedet-compat (defalias 'semantic-subst-char-in-string 'subst-char-in-string) ) === modified file 'lisp/cedet/semantic/lex-spp.el' --- lisp/cedet/semantic/lex-spp.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/lex-spp.el 2012-10-05 05:57:24 +0000 @@ -646,7 +646,7 @@ ;; #define FOO(a) foo##a##bar (semantic-lex-spp-symbol-merge (cadr tok))) (t - (message "Invalid merge macro ecountered; \ + (message "Invalid merge macro encountered; \ will return empty string instead.") ""))) txt === modified file 'lisp/cedet/semantic/symref/filter.el' --- lisp/cedet/semantic/symref/filter.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/symref/filter.el 2012-10-05 05:57:24 +0000 @@ -101,7 +101,7 @@ (semantic-tag-start tag) (semantic-tag-end tag)) (when (called-interactively-p 'interactive) - (message "Found %d occurances of %s in %.2f seconds" + (message "Found %d occurrences of %s in %.2f seconds" Lcount (semantic-tag-name target) (semantic-elapsed-time start (current-time)))) Lcount))) === modified file 'lisp/cedet/semantic/tag-ls.el' --- lisp/cedet/semantic/tag-ls.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/tag-ls.el 2012-10-05 05:57:24 +0000 @@ -66,7 +66,7 @@ (define-overloadable-function semantic--tag-similar-types-p (tag1 tag2) "Compare the types of TAG1 and TAG2. -This functions can be overriden, for example to compare a fully +This function can be overridden, for example to compare a fully qualified with an unqualified type." (cond ((and (null (semantic-tag-type tag1)) @@ -80,7 +80,7 @@ (defun semantic--tag-similar-types-p-default (tag1 tag2) "Compare the types of TAG1 and TAG2. -This functions can be overriden, for example to compare a fully +This function can be overridden, for example to compare a fully qualified with an unqualified type." (semantic-tag-of-type-p tag1 (semantic-tag-type tag2))) @@ -97,7 +97,7 @@ to do the default equality tests if ATTR is not special for that mode.") (defun semantic--tag-attribute-similar-p-default (attr value1 value2 ignorable-attributes) - "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarness." + "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarity." (cond ;; Tag sublists require special testing. ((and (listp value1) (semantic-tag-p (car value1)) @@ -131,7 +131,7 @@ are similar w/out checking the sub-list of tags. Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing similarity. By default, `semantic-tag-similar-ignorable-attributes' is referenced for -attributes, and IGNOREABLE-ATTRIBUTES will augment this list. +attributes, and IGNORABLE-ATTRIBUTES will augment this list. Note that even though :name is not an attribute, it can be used to to indicate lax comparison of names via `semantic--tag-similar-names-p'") @@ -207,7 +207,7 @@ (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) "Return the fully qualified name of TAG in the package hierarchy. -STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream', +STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream', but must be a toplevel semantic tag stream that contains TAG. A Package Hierarchy is defined in UML by the way classes and methods are organized on disk. Some languages use this concept such that a === modified file 'lisp/cedet/semantic/tag.el' --- lisp/cedet/semantic/tag.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/tag.el 2012-10-05 05:57:24 +0000 @@ -554,7 +554,7 @@ "Set TAG name to NAME." (setcar tag name)) -;;; TAG Proxys +;;; TAG Proxies ;; ;; A new kind of tag is a TAG PROXY. These are tags that have some ;; minimal number of features set, such as name and class, but have a @@ -570,7 +570,7 @@ to be resolved, and DATA is the DATA passed into this function. DATA is data to help resolve the proxy. DATA can be an EIEIO object, such that FUNCTION is a method. -FUNCTION should return a list of tags, preferrably one tag." +FUNCTION should return a list of tags, preferably one tag." (let ((sym (make-symbol ":tag-proxy"))) (put sym 'proxy-function function) (put sym 'proxy-data data) === modified file 'lisp/emacs-lisp/eieio-base.el' --- lisp/emacs-lisp/eieio-base.el 2012-10-01 18:10:29 +0000 +++ lisp/emacs-lisp/eieio-base.el 2012-10-05 05:57:24 +0000 @@ -228,8 +228,8 @@ "Read a persistent object from FILENAME, and return it. Signal an error if the object in FILENAME is not a constructor for CLASS. Optional ALLOW-SUBCLASS says that it is ok for -`eieio-peristent-read' to load in subclasses of class instead of -being pendantic." +`eieio-persistent-read' to load in subclasses of class instead of +being pedantic." (unless class (message "Unsafe call to `eieio-persistent-read'.")) (when (and class (not (class-p class))) @@ -301,7 +301,7 @@ "Validate that in CLASS, the SLOT with PROPOSED-VALUE is good, then fix. A limited number of functions, such as quote, list, and valid object constructor functions are considered valid. -Secondarilly, any text properties will be stripped from strings." +Second, any text properties will be stripped from strings." (cond ((consp proposed-value) ;; Lists with something in them need special treatment. (let ((slot-idx (eieio-slot-name-index class nil slot)) === modified file 'lisp/emacs-lisp/timer.el' --- lisp/emacs-lisp/timer.el 2012-09-25 04:13:02 +0000 +++ lisp/emacs-lisp/timer.el 2012-10-05 05:57:24 +0000 @@ -204,7 +204,7 @@ "Insert TIMER into `timer-idle-list'. This arranges to activate TIMER whenever Emacs is next idle. If optional argument DONT-WAIT is non-nil, set TIMER to activate -immediately \(see beloe\), or at the right time, if Emacs is +immediately \(see below\), or at the right time, if Emacs is already idle. REUSE-CELL, if non-nil, is a cons cell to reuse when inserting === modified file 'lisp/ido.el' --- lisp/ido.el 2012-09-30 12:28:50 +0000 +++ lisp/ido.el 2012-10-05 05:57:24 +0000 @@ -496,7 +496,7 @@ ;; See http://debbugs.gnu.org/2042 for more info. (defcustom ido-buffer-disable-smart-matches t "Non-nil means not to re-order matches for buffer switching. -By default, ido aranges matches in the following order: +By default, ido arranges matches in the following order: full-matches > suffix matches > prefix matches > remaining matches === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2012-10-01 05:41:14 +0000 +++ lisp/org/ChangeLog 2012-10-05 05:57:24 +0000 @@ -2079,13 +2079,7 @@ * org-agenda.el (org-agenda-list): Ensures that the list returned by `org-agenda-add-time-grid-maybe' is appended to Ì€rtnall' before - checking if the latter is emtpy. - -2012-09-30 Christophe Junke (tiny change) - - * org-agenda.el (org-agenda-list): Ensure that the list returned - by `org-agenda-add-time-grid-maybe' is appended to `rtnall' before - checking if the latter is emtpy. + checking if the latter is empty. 2012-09-30 Christophe Rhodes (tiny change) @@ -2691,7 +2685,7 @@ * org-element.el (org-element-paragraph-parser): Fix parsing of paragraph at the beginning of an item. - * org.el (org-mode): Set back comment-start-skip so comment-dwin + * org.el (org-mode): Set back comment-start-skip so comment-dwim can tell a keyword from a comment. * org.el (org-set-autofill-regexps): Install new comment line @@ -2959,7 +2953,7 @@ * org-capture.el (org-capture-fill-template): Expand % escape sequences into text entered for 'th %^{PROMPT} escape. - + * org-capture.el (org-capture-fill-template): Fixed regexp for % expandos to match any positive integer. (org-capture-templates): Updated docstring accordingly. === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2012-09-30 15:14:59 +0000 +++ lisp/org/org-agenda.el 2012-10-05 05:57:24 +0000 @@ -823,7 +823,7 @@ :group 'org-agenda-daily/weekly :version "24.1" :type '(choice - (const :tag "Alwas show prewarning" nil) + (const :tag "Always show prewarning" nil) (const :tag "Remove prewarning if entry is scheduled" t) (integer :tag "Restart prewarning N days before deadline"))) @@ -2837,7 +2837,7 @@ (widen) (let ((inhibit-read-only t)) (add-text-properties (point-min) (point-max) - `(org-serie t org-serie-redo-cmd ,redo))) + `(org-series t org-series-redo-cmd ,redo))) (setq org-agenda-redo-command redo) (goto-char (point-min))) (org-agenda-fit-window-to-buffer) @@ -4019,7 +4019,7 @@ `(org-agenda-type agenda org-last-args (,arg ,start-day ,span) org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (if (eq org-agenda-show-log-scoped 'clockcheck) (org-agenda-show-clocking-issues)) (org-agenda-finalize) @@ -4324,7 +4324,7 @@ `(org-agenda-type search org-last-args (,todo-only ,string ,edit-at) org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (org-agenda-finalize) (setq buffer-read-only t)))) @@ -4414,7 +4414,7 @@ `(org-agenda-type todo org-last-args ,arg org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (org-agenda-finalize) (setq buffer-read-only t)))) @@ -4499,7 +4499,7 @@ `(org-agenda-type tags org-last-args (,todo-only ,match) org-redo-cmd ,org-agenda-redo-command - org-serie-cmd ,org-cmd)) + org-series-cmd ,org-cmd)) (org-agenda-finalize) (setq buffer-read-only t)))) @@ -6583,7 +6583,7 @@ (org-agenda-Quit)) (defun org-agenda-kill-all-agenda-buffers () - "Kill all buffers in `org-agena-mode'. + "Kill all buffers in `org-agenda-mode'. This is used when toggling sticky agendas. You can also explicitly invoke it with `C-c a C-k'." (interactive) @@ -6623,20 +6623,20 @@ (lprops (get 'org-agenda-redo-command 'org-lprops)) (redo-cmd (get-text-property p 'org-redo-cmd)) (last-args (get-text-property p 'org-last-args)) - (org-agenda-overriding-cmd (get-text-property p 'org-serie-cmd)) + (org-agenda-overriding-cmd (get-text-property p 'org-series-cmd)) (org-agenda-overriding-cmd-arguments (unless (eq all t) (cond ((listp last-args) (cons (or cpa (car last-args)) (cdr last-args))) ((stringp last-args) last-args)))) - (serie-redo-cmd (get-text-property p 'org-serie-redo-cmd))) + (series-redo-cmd (get-text-property p 'org-series-redo-cmd))) (put 'org-agenda-tag-filter :preset-filter nil) (put 'org-agenda-category-filter :preset-filter nil) (and cols (org-columns-quit)) (message "Rebuilding agenda buffer...") - (if serie-redo-cmd - (eval serie-redo-cmd) + (if series-redo-cmd + (eval series-redo-cmd) (org-let lprops '(eval redo-cmd))) (setq org-agenda-undo-list nil org-agenda-pending-undo-list nil) @@ -7035,7 +7035,7 @@ (or (and cnt (text-property-any (point-min) (point-max) 'org-day-cnt cnt)) (text-property-any (point-min) (point-max) 'org-today t) (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda) - (and (get-text-property (min (1- (point-max)) (point)) 'org-serie) + (and (get-text-property (min (1- (point-max)) (point)) 'org-series) (org-agenda-goto-block-beginning)) (point-min)))) @@ -7090,7 +7090,7 @@ ;; `cmd' may have been set by `org-agenda-run-series' which ;; uses `org-agenda-overriding-cmd' to decide whether ;; overriding is allowed for `cmd' - (get-text-property (min (1- (point-max)) (point)) 'org-serie-cmd)) + (get-text-property (min (1- (point-max)) (point)) 'org-series-cmd)) (org-agenda-overriding-arguments (list (car args) sd span))) (org-agenda-redo) @@ -7183,7 +7183,7 @@ org-starting-day)) (sd (org-agenda-compute-starting-span sd span n)) (org-agenda-overriding-cmd - (get-text-property (min (1- (point-max)) (point)) 'org-serie-cmd)) + (get-text-property (min (1- (point-max)) (point)) 'org-series-cmd)) (org-agenda-overriding-arguments (list (car args) sd span))) (org-agenda-redo) === modified file 'lisp/org/org-element.el' --- lisp/org/org-element.el 2012-09-30 15:14:59 +0000 +++ lisp/org/org-element.el 2012-10-05 05:57:24 +0000 @@ -3924,7 +3924,7 @@ (and (eq type 'paragraph) (equal data (car (org-element-contents parent))) (memq (org-element-type parent) - '(footnote-definiton item)))))) + '(footnote-definition item)))))) ""))) (funcall (intern (format "org-element-%s-interpreter" type)) data === modified file 'lisp/org/org-faces.el' --- lisp/org/org-faces.el 2012-09-30 15:14:59 +0000 +++ lisp/org/org-faces.el 2012-10-05 05:57:24 +0000 @@ -293,7 +293,7 @@ (((class color) (min-colors 8) (background dark)) (:foreground "red" :inverse-video t)) (t (:inverse-video t)))) "Face for highlighting the calendar day when using `org-read-date'. -Using a bold face here might cause discrepencies while displaying the +Using a bold face here might cause discrepancies while displaying the calendar." :group 'org-faces) === modified file 'lisp/org/org-remember.el' --- lisp/org/org-remember.el 2012-09-30 15:14:59 +0000 +++ lisp/org/org-remember.el 2012-10-05 05:57:24 +0000 @@ -64,7 +64,7 @@ \\[universal-argument] \\[org-remember-finalize] to file the note. When this variable is nil, \\[org-remember-finalize] gives you the prompts, and -\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack." +\\[universal-argument] \\[org-remember-finalize] triggers the fast track." :group 'org-remember :type 'boolean) === modified file 'lisp/proced.el' --- lisp/proced.el 2012-09-23 12:34:23 +0000 +++ lisp/proced.el 2012-10-05 05:57:24 +0000 @@ -1784,7 +1784,7 @@ process-alist)))) (unless (and signal process-alist) - ;; Discouraged usge (supported for backward compatibility): + ;; Discouraged usage (supported for backward compatibility): ;; The new calling sequence separates more cleanly between the parts ;; of the code required for interactive and noninteractive calls so that ;; the command can be used more flexibly in noninteractive ways, too. === modified file 'lisp/profiler.el' --- lisp/profiler.el 2012-10-02 06:30:40 +0000 +++ lisp/profiler.el 2012-10-05 05:57:24 +0000 @@ -495,7 +495,7 @@ t)))))) (defun profiler-report-collapse-entry () - "Collpase entry at point." + "Collapse entry at point." (interactive) (save-excursion (beginning-of-line) === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2012-10-04 16:39:37 +0000 +++ lisp/progmodes/python.el 2012-10-05 05:57:24 +0000 @@ -502,7 +502,7 @@ (and ;; Match even number of backslashes. (or (not (any ?\\ ?\' ?\")) point - ;; Quotes might be preceeded by a escaped quote. + ;; Quotes might be preceded by a escaped quote. (and (or (not (any ?\\)) point) ?\\ (* ?\\ ?\\) (any ?\' ?\"))) (* ?\\ ?\\) === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2012-09-28 05:19:55 +0000 +++ lisp/progmodes/verilog-mode.el 2012-10-05 05:57:24 +0000 @@ -5148,7 +5148,7 @@ whitespace with \\[verilog-delete-trailing-whitespace] on all command-line files, and saves the buffers." (unless noninteractive - (error "Use verilog-batch-delete-trailing-whitepace only with --batch")) ;; Otherwise we'd mess up buffer modes + (error "Use verilog-batch-delete-trailing-whitespace only with --batch")) ;; Otherwise we'd mess up buffer modes (verilog-batch-execute-func `verilog-delete-trailing-whitespace)) (defun verilog-batch-diff-auto () @@ -12161,7 +12161,7 @@ Interface names must be resolvable to filenames. See `verilog-auto-inst'. As with other autos, any inputs/outputs declared in the module -will suppress the AUTO from redeclarating an inputs/outputs by +will suppress the AUTO from redeclaring an input/output by the same name. An example: === modified file 'lisp/subr.el' --- lisp/subr.el 2012-09-25 05:33:43 +0000 +++ lisp/subr.el 2012-10-05 05:57:24 +0000 @@ -3170,7 +3170,7 @@ (set-window-hscroll window 0) ;; Don't try this with NOFORCE non-nil! (set-window-start window (point-min) t) - ;; This hould not be necessary. + ;; This should not be necessary. (set-window-point window (point-min)) ;; Run `temp-buffer-show-hook', with the chosen window selected. (with-selected-window window === modified file 'lisp/textmodes/reftex.el' --- lisp/textmodes/reftex.el 2012-09-30 20:30:13 +0000 +++ lisp/textmodes/reftex.el 2012-10-05 05:57:24 +0000 @@ -2466,7 +2466,7 @@ "Remember to cover the basics, that is, what you expected to happen and what in fact did happen. -Check if the bug is reproducable with an up-to-date version of +Check if the bug is reproducible with an up-to-date version of RefTeX available from http://www.gnu.org/software/auctex/. If the bug is triggered by a specific \(La\)TeX file, you should try === modified file 'lisp/window.el' --- lisp/window.el 2012-09-30 10:44:43 +0000 +++ lisp/window.el 2012-10-05 05:57:24 +0000 @@ -701,7 +701,7 @@ (set-window-parameter new 'delete-window 'delete-side-window) ;; Auto-adjust height/width of new window unless a size has been ;; explicitly requested. - (unless (if left-or-right + (unless (if left-or-right (cdr (assq 'window-width alist)) (cdr (assq 'window-height alist))) (setq alist @@ -5615,7 +5615,7 @@ buffer window 'reuse alist display-buffer-mark-dedicated))))) (defun display-buffer-at-bottom (buffer alist) - "Try displaying BUFFER in a window at the botom of the selected frame. + "Try displaying BUFFER in a window at the bottom of the selected frame. This either splits the window at the bottom of the frame or the frame's root window, or reuses an existing window at the bottom of the selected frame." === modified file 'src/lread.c' --- src/lread.c 2012-10-01 06:36:54 +0000 +++ src/lread.c 2012-10-05 05:57:24 +0000 @@ -1700,7 +1700,7 @@ if (NILP (Ffboundp (macroexpand)) /* Don't macroexpand in .elc files, since it should have been done already. We actually don't know whether we're in a .elc file or not, - so we use circumstancial evidence: .el files normally go through + so we use circumstantial evidence: .el files normally go through Vload_source_file_function -> load-with-code-conversion -> eval-buffer. */ || EQ (readcharfun, Qget_file_char) === modified file 'src/unexmacosx.c' --- src/unexmacosx.c 2012-09-21 03:03:48 +0000 +++ src/unexmacosx.c 2012-10-05 05:57:24 +0000 @@ -119,7 +119,7 @@ /* LC_DATA_IN_CODE is not defined in mach-o/loader.h on OS X 10.7. But it is used if we build with "Command Line Tools for Xcode 4.5 - (OS X Lion) - Septemper 2012". */ + (OS X Lion) - September 2012". */ #ifndef LC_DATA_IN_CODE #define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */ #endif ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.