Mercurial > emacs
changeset 108399:eb2ca69029d2
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 17 Jan 2010 12:46:11 +0000 |
| parents | 1789ed4b257e (current diff) 6a41bf7947b3 (diff) |
| children | f1cb61394e72 |
| files | |
| diffstat | 20 files changed, 100 insertions(+), 59 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/notes/BRANCH Sun Jan 17 00:12:59 2010 +0000 +++ b/admin/notes/BRANCH Sun Jan 17 12:46:11 2010 +0000 @@ -1,11 +1,10 @@ -This file describes the CVS branch in which it is maintained. +This file describes the bzr branch in which it is maintained. Everything below the line is branch-specific. ________________________________________________________________________ This is the trunk (sometimes mistakenly called "HEAD"). -When people say "use CVS emacs", this is the branch they are talking -about. Likewise, a "cvs checkout" without the "-r" option results in -this branch. +When people say "use the development version of Emacs" or the +"bzr version of Emacs", this is the branch they are talking about. Emacs development takes place on the trunk. Most of the time, Emacs hackers add to it relatively free of constraint (aside from proper
--- a/admin/notes/copyright Sun Jan 17 00:12:59 2010 +0000 +++ b/admin/notes/copyright Sun Jan 17 12:46:11 2010 +0000 @@ -24,9 +24,9 @@ 2. When installing code written by someone else, the ChangeLog entry should be in the name of the author of the code, not the person who -installs it. I think it is helpful to put the author (if not yourself) -in the CVS log as well; and to not install any of your own changes in -the same commit. +installs it. I think it is helpful to put the author (if not yourself) +in the commit log as well (you can also use bzr commit's "--author" +option); and to not install any of your own changes in the same commit. 3. With images, add the legal info to a README file in the directory containing the image. @@ -38,17 +38,17 @@ right thing to do. -Every non-trivial file distributed through the Emacs CVS should be +Every non-trivial file distributed through the Emacs repository should be self-explanatory in terms of copyright and license. This includes files that are not distributed in Emacs releases (for example, the -admin/ directory), because the whole Emacs CVS is publicly +admin/ directory), because the whole Emacs repository is publicly available. The definition of triviality is a little vague, but a rule of thumb is that any file with less than 15 lines of actual content is trivial. If a file is auto-generated (eg ldefs-boot.el) from another one in the -CVS, then it does not really matter about adding a copyright statement -to the generated file. +repository, then it does not really matter about adding a copyright +statement to the generated file. Legal advice says that we could, if we wished, put a license notice even in trivial files, because copyright law in general looks at the @@ -67,8 +67,8 @@ should display copyright notices (an exception to the rule about "generated" files), but these can just display the latest year. The full list of years should be kept in comments in the source file. If -these are distributed in CVS, check in a regenerated version when the -tex files are updated. +these are distributed in the repository, check in a regenerated +version when the tex files are updated. Copyright changes should be propagated to any associated repositories (eg Gnus, MH-E), but I think in every case this happens automatically @@ -115,7 +115,7 @@ else it is possible the file should not be in Emacs at all (please report!). -Note that it seems painfully clear that one cannot rely on CVS logs, +Note that it seems painfully clear that one cannot rely on commit logs, or even ChangeLogs, for older changes. People often installed changes from others, without recording the true authorship. @@ -555,10 +555,10 @@ obviously good): -Is it OK to just `cvs remove' a file for legal reasons, or is +Is it OK to just `bzr remove' a file for legal reasons, or is something more drastic needed? A removed file is still available from -CVS, if suitable options are applied. (This CVS issue obviously does -not affect a release). +the repository, if suitable options are applied. (This issue obviously +does not affect a release). rms: will ask lawyer @@ -600,7 +600,7 @@ Some notes: (see http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg01431.html) -1. There are some files in Emacs CVS which are not part of Emacs (eg +1. There are some files in the Emacs tree which are not part of Emacs (eg those included from Gnulib). These are all copyright FSF and (at time of writing) GPL >= 2. rms says may as well leave the licenses of these alone (may import them from Gnulib again). These are:
--- a/doc/lispref/ChangeLog Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/lispref/ChangeLog Sun Jan 17 12:46:11 2010 +0000 @@ -1,3 +1,7 @@ +2010-01-17 Juanma Barranquero <lekktu@gmail.com> + + * two.el (volume-header-toc-markup): Fix typos in docstring. + 2010-01-04 Stefan Monnier <monnier@iro.umontreal.ca> Avoid dubious uses of save-excursions.
--- a/doc/lispref/two.el Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/lispref/two.el Sun Jan 17 12:46:11 2010 +0000 @@ -54,8 +54,8 @@ (defun volume-header-toc-markup () "Insert Volume I and Volume II text into .toc file. -NOTE: this auxilary function is file specific. -This is for the *Elisp Ref Manual*" +NOTE: this auxiliary function is file specific. +This is for the *Elisp Ref Manual*." (interactive) (goto-char (point-min)) (insert "\\unnumbchapentry {Volume 1}{}\n\\unnumbchapentry {}{}\n")
--- a/doc/misc/ChangeLog Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/misc/ChangeLog Sun Jan 17 12:46:11 2010 +0000 @@ -1,3 +1,22 @@ +2010-01-17 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi (Frequently Asked Questions): Add GNU Emacs 23 and + SXEmacs 22 to the supported systems. New item for hung ssh sessions. + +2010-01-17 Glenn Morris <rgm@gnu.org> + + * calc.texi (Reporting Bugs): Don't mention format of repository. + + * woman.texi (Bugs): Make "Emacs repository" less specific, + and the URL for same more specific. + + * faq.texi (Latest version of Emacs): The repository is now Bazaar. + +2010-01-17 Juanma Barranquero <lekktu@gmail.com> + + * ede.texi (ede-step-project, ede-proj-target): + * tramp.texi (Remote processes): Fix typos. + 2010-01-16 Mario Lang <mlang@delysid.org> * ede.texi (ede-target):
--- a/doc/misc/calc.texi Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/misc/calc.texi Sun Jan 17 12:46:11 2010 +0000 @@ -35269,7 +35269,7 @@ so any efforts can be coordinated. The latest version of Calc is available from Savannah, in the Emacs -CVS tree. See @uref{http://savannah.gnu.org/projects/emacs}. +repository. See @uref{http://savannah.gnu.org/projects/emacs}. @c [summary] @node Summary, Key Index, Reporting Bugs, Top
--- a/doc/misc/ede.texi Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/misc/ede.texi Sun Jan 17 12:46:11 2010 +0000 @@ -1728,7 +1728,7 @@ Type: @code{(or null list)} @* Default Value: @code{(quote ("GNUmakefile.preamble"))} -The auxilliary makefile for additional variables. +The auxiliary makefile for additional variables. Included just before the specific target files. @refill @@ -1736,7 +1736,7 @@ Type: @code{(or null list)} @* Default Value: @code{(quote ("GNUmakefile.postamble"))} -The auxilliary makefile for additional rules. +The auxiliary makefile for additional rules. Included just after the specific target files. @refill @@ -2083,7 +2083,7 @@ Type: @code{list} @* Default Value: @code{nil} -Auxilliary source files included in this target. +Auxiliary source files included in this target. Each of these is considered equivalent to a source file, but it is not distributed, and each should have a corresponding rule to build it. @refill
--- a/doc/misc/faq.texi Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/misc/faq.texi Sun Jan 17 12:46:11 2010 +0000 @@ -1008,9 +1008,7 @@ @cindex Latest version of Emacs @cindex Development, Emacs @cindex Repository, Emacs -@cindex CVS repository, Emacs -@cindex Arch repository, Emacs -@cindex Git repository, Emacs +@cindex Bazaar repository, Emacs Emacs @value{VER} is the current version as of this writing. A version number with two components (e.g. @samp{22.1}) indicates a released @@ -1020,9 +1018,8 @@ Emacs is under active development, hosted at @uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source code can be retrieved anonymously following the -@uref{http://savannah.gnu.org/cvs/?group=emacs, instructions}. -The primary repository is CVS, but Arch and Git mirrors are also -available. +@uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}. +The repository is GNU Bazaar. Because Emacs undergoes many changes before a release, the version number of a development version is not especially meaningful. It is
--- a/doc/misc/woman.texi Sun Jan 17 00:12:59 2010 +0000 +++ b/doc/misc/woman.texi Sun Jan 17 12:46:11 2010 +0000 @@ -4,7 +4,7 @@ @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man'' @c FIXME @c Manual last updated: -@set UPDATED Time-stamp: <2009-02-16 09:25:50 karl> +@set UPDATED Time-stamp: <Sat 16-Jan-2010 19:18:43 gm on grasmoor> @c Software version: @set VERSION 0.54 (beta) @afourpaper @@ -18,8 +18,8 @@ This file documents WoMan: A program to browse Unix manual pages `W.O. (without) man'. -Copyright @copyright{} 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +2009, 2010 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1319,8 +1319,8 @@ @enumerate @item -try the latest version of @file{woman.el} from the Emacs CVS repository -on @uref{http://savannah.gnu.org/}. If it still fails, please +try the latest version of @file{woman.el} from the Emacs repository +on @uref{http://savannah.gnu.org/projects/emacs/}. If it still fails, please @item send a bug report to @email{bug-gnu-emacs@@gnu.org} and to
--- a/lisp/ChangeLog Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/ChangeLog Sun Jan 17 12:46:11 2010 +0000 @@ -1,3 +1,20 @@ +2010-01-17 Jay Belanger <jay.p.belanger@gmail.com> + + * calc/calc.el (calc-command-flags): Give it an initial value. + +2010-01-17 Glenn Morris <rgm@gnu.org> + + * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer): Doc fix. + +2010-01-17 Juanma Barranquero <lekktu@gmail.com> + + * cedet/semantic.el (semantic-mode): + * files.el (minibuffer-with-setup-hook): + * textmodes/artist.el (artist-mt, artist-key-undraw-continously) + (artist-key-draw-continously, artist-key-do-continously-continously) + (artist-key-set-point-continously, artist-mouse-draw-continously): + Fix typos in docstrings. + 2010-01-16 Lennart Borgman <lennart.borgman@gmail.com> * nxml/nxml-mode.el (nxml-extend-after-change-region): Never
--- a/lisp/calc/calc.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/calc/calc.el Sun Jan 17 12:46:11 2010 +0000 @@ -1546,7 +1546,7 @@ (defvar calc-aborted-prefix nil) (defvar calc-start-time nil) -(defvar calc-command-flags) +(defvar calc-command-flags nil) (defvar calc-final-point-line) (defvar calc-final-point-column) ;;; Note that modifications to this function may break calc-pass-errors.
--- a/lisp/cedet/ede/proj-aux.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/cedet/ede/proj-aux.el Sun Jan 17 12:46:11 2010 +0000 @@ -1,4 +1,4 @@ -;;; ede/proj-aux.el --- EDE Generic Project auxilliary file support +;;; ede/proj-aux.el --- EDE Generic Project auxiliary file support ;; Copyright (C) 1998, 1999, 2000, 2007, 2009, 2010 Free Software Foundation, Inc.
--- a/lisp/cedet/semantic.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/cedet/semantic.el Sun Jan 17 12:46:11 2010 +0000 @@ -1014,7 +1014,7 @@ ;; The `semantic-mode' command, in conjuction with the ;; `semantic-default-submodes' variable, toggles Semantic's various -;; auxilliary minor modes. +;; auxiliary minor modes. (defvar semantic-load-system-cache-loaded nil "Non nil when the Semantic system caches have been loaded. @@ -1057,7 +1057,7 @@ In Semantic mode, Emacs parses the buffers you visit for their semantic content. This information is used by a variety of -auxilliary minor modes, listed in `semantic-default-submodes'; +auxiliary minor modes, listed in `semantic-default-submodes'; all the minor modes in this list are also enabled when you enable Semantic mode. @@ -1067,7 +1067,7 @@ (if semantic-mode ;; Turn on Semantic mode (progn - ;; Enable all the global auxilliary minor modes in + ;; Enable all the global auxiliary minor modes in ;; `semantic-submode-list'. (dolist (mode semantic-submode-list) (if (memq mode semantic-default-submodes)
--- a/lisp/cedet/semantic/idle.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/cedet/semantic/idle.el Sun Jan 17 12:46:11 2010 +0000 @@ -338,7 +338,7 @@ (defun semantic-idle-work-for-one-buffer (buffer) "Do long-processing work for BUFFER. Uses `semantic-safe' and returns the output. -Returns t of all processing succeeded." +Returns t if all processing succeeded." (with-current-buffer buffer (not (and ;; Just in case
--- a/lisp/files.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/files.el Sun Jan 17 12:46:11 2010 +0000 @@ -1289,7 +1289,7 @@ Recursive uses of the minibuffer are unaffected (FUN is not called additional times). -This macro actually adds an auxilliary function that calls FUN, +This macro actually adds an auxiliary function that calls FUN, rather than FUN itself, to `minibuffer-setup-hook'." (declare (indent 1) (debug t)) (let ((hook (make-symbol "setup-hook")))
--- a/lisp/gnus/ChangeLog Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/gnus/ChangeLog Sun Jan 17 12:46:11 2010 +0000 @@ -1,3 +1,8 @@ +2010-01-17 Juanma Barranquero <lekktu@gmail.com> + + * nnmairix.el (nnmairix-group-delete-recreate-this-group): + Fix typo in docstring. + 2010-01-08 Jason Rumney <jasonr@gnu.org> * sieve-manage.el (sieve-manage-parse-capability-1): Loosely match OK
--- a/lisp/gnus/nnmairix.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/gnus/nnmairix.el Sun Jan 17 12:46:11 2010 +0000 @@ -1104,7 +1104,7 @@ (defun nnmairix-group-delete-recreate-this-group () "Deletes and recreates group on the back end. -You can use this function on nnmairix groups which continously +You can use this function on nnmairix groups which continuously show wrong article counts." (interactive) (let* ((group (gnus-group-group-name))
--- a/lisp/textmodes/artist.el Sun Jan 17 00:12:59 2010 +0000 +++ b/lisp/textmodes/artist.el Sun Jan 17 12:46:11 2010 +0000 @@ -870,7 +870,7 @@ is done. Arguments and return values for this funcion are described below. DRAW-HOW defines the kind of shape. The kinds of shapes are: - `artist-do-continously' -- Do drawing operation continously, + `artist-do-continously' -- Do drawing operation continuously, as long as the mouse button is held down. `artist-do-poly' -- Do drawing operation many times. 1 -- Do drawing operation only once. @@ -3879,8 +3879,8 @@ ;; (defun artist-key-undraw-continously (x y) - "Undraw current continous shape with point at X, Y." - ;; No undraw-info for continous shapes + "Undraw current continuous shape with point at X, Y." + ;; No undraw-info for continuous shapes nil) (defun artist-key-undraw-poly (x y) @@ -3937,7 +3937,7 @@ ;; user has released the button, so the timer will always be cancelled ;; at that point. (defun artist-key-draw-continously (x y) - "Draw current continous shape at X,Y." + "Draw current continuous shape at X,Y." (let ((draw-fn (artist-go-get-draw-fn-from-symbol artist-curr-go))) (setq artist-key-shape (artist-funcall draw-fn x y)))) @@ -4018,7 +4018,7 @@ ;; (defun artist-key-do-continously-continously (x y) - "Update current continous shape at X,Y." + "Update current continuous shape at X,Y." (let ((draw-fn (artist-go-get-draw-fn-from-symbol artist-curr-go))) (artist-funcall draw-fn x y))) @@ -4045,7 +4045,7 @@ (defun artist-key-do-continously-1point (x y) "Update current 1-point shape at X,Y." - ;; Nothing to do continously for operations + ;; Nothing to do continuously for operations ;; where we have only one input point nil) @@ -4094,8 +4094,8 @@ (defun artist-key-set-point-continously (x y) - "Set point for current continous shape at X,Y." - ;; Maybe set arrow-points for continous shapes + "Set point for current continuous shape at X,Y." + ;; Maybe set arrow-points for continuous shapes (let ((arrow-pred (artist-go-get-arrow-pred-from-symbol artist-curr-go)) (arrow-set-fn (artist-go-get-arrow-set-fn-from-symbol artist-curr-go)) (init-fn (artist-go-get-init-fn-from-symbol artist-curr-go)) @@ -4914,7 +4914,7 @@ (defun artist-mouse-draw-continously (ev) "Generic function for shapes that require 1 point as input. -Operation is done continously while the mouse button is hold down. +Operation is done continuously while the mouse button is hold down. The event, EV, is the mouse event." (let* ((unshifted (artist-go-get-symbol-shift artist-curr-go nil)) (shifted (artist-go-get-symbol-shift artist-curr-go t)) @@ -5395,8 +5395,8 @@ ;; 1. If your new drawing mode falls into one of the following ;; categories, goto point 2, otherwise goto point 3. ;; -;; - Modes where the shapes are drawn continously, as long as -;; the mouse button is held down (continous modes). +;; - Modes where the shapes are drawn continuously, as long as +;; the mouse button is held down (continuous modes). ;; Example: the erase-char mode, the pen and pen-line modes. ;; ;; - Modes where the shape is made up of from 2 points to an @@ -5408,7 +5408,7 @@ ;; Example: lines, rectangles ;; ;; - Modes where the shape is made up of 1 point (1-point -;; modes). This mode differs from the continous modes in +;; modes). This mode differs from the continuous modes in ;; that the shape is drawn only once when the mouse button ;; is pressed. ;; Examples: paste, a flood-fill, vaporize modes @@ -5426,7 +5426,7 @@ ;; For each of the cases below, the arguments given to the init-fn, ;; prep-fill-fn, arrow-set-fn and exit-fn are stated. ;; -;; If your mode matches the continous mode or the 1-point mode: +;; If your mode matches the continuous mode or the 1-point mode: ;; ;; a. Create a draw-function that draws your shape. Your function ;; must take x and y as arguments. The return value is not @@ -5538,8 +5538,8 @@ ;; - artist-key-set-point-xxx for setting a point in the ;; mode, to be called from `artist-key-set-point-common'. ;; -;; - artist-key-do-continously-xxx to be called from -;; `artist-key-do-continously-common' whenever the user +;; - artist-key-do-continuously-xxx to be called from +;; `artist-key-do-continuously-common' whenever the user ;; moves around. ;; ;; As for the artist-mouse-draw-xxx, these two functions must