Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99360. ------------------------------------------------------------ revno: 99360 committer: Jay Belanger branch nick: trunk timestamp: Sat 2010-01-16 23:08:35 -0600 message: Give `calc-command-flags' an initial value. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-17 02:54:35 +0000 +++ lisp/ChangeLog 2010-01-17 05:08:35 +0000 @@ -1,3 +1,7 @@ +2010-01-17 Jay Belanger + + * calc/calc.el (calc-command-flags): Give it an initial value. + 2010-01-17 Glenn Morris * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer): Doc fix. === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2010-01-13 08:35:10 +0000 +++ lisp/calc/calc.el 2010-01-17 05:08:35 +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. ------------------------------------------------------------ revno: 99359 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 19:24:31 -0800 message: (Reporting Bugs): Don't mention format of repository. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-17 03:20:08 +0000 +++ doc/misc/ChangeLog 2010-01-17 03:24:31 +0000 @@ -1,5 +1,7 @@ 2010-01-17 Glenn Morris + * 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. === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2010-01-13 08:35:10 +0000 +++ doc/misc/calc.texi 2010-01-17 03:24:31 +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 ------------------------------------------------------------ revno: 99358 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 19:20:08 -0800 message: (Bugs): Make "Emacs repository" less specific, and the URL for same more specific. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-17 03:11:09 +0000 +++ doc/misc/ChangeLog 2010-01-17 03:20:08 +0000 @@ -1,5 +1,8 @@ 2010-01-17 Glenn Morris + * 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 === modified file 'doc/misc/woman.texi' --- doc/misc/woman.texi 2010-01-13 08:35:10 +0000 +++ doc/misc/woman.texi 2010-01-17 03:20:08 +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: @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 ------------------------------------------------------------ revno: 99357 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 19:11:09 -0800 message: (Latest version of Emacs): The repository is now Bazaar. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-17 02:22:44 +0000 +++ doc/misc/ChangeLog 2010-01-17 03:11:09 +0000 @@ -1,3 +1,7 @@ +2010-01-17 Glenn Morris + + * faq.texi (Latest version of Emacs): The repository is now Bazaar. + 2010-01-17 Juanma Barranquero * ede.texi (ede-step-project, ede-proj-target): === modified file 'doc/misc/faq.texi' --- doc/misc/faq.texi 2010-01-13 08:35:10 +0000 +++ doc/misc/faq.texi 2010-01-17 03:11:09 +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 ------------------------------------------------------------ revno: 99356 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 19:03:59 -0800 message: Edit some notes/ files to replace `cvs' with `bzr', or something general. diff: === modified file 'admin/notes/BRANCH' --- admin/notes/BRANCH 2010-01-04 05:18:51 +0000 +++ admin/notes/BRANCH 2010-01-17 03:03:59 +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 === modified file 'admin/notes/copyright' --- admin/notes/copyright 2010-01-13 08:35:10 +0000 +++ admin/notes/copyright 2010-01-17 03:03:59 +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: ------------------------------------------------------------ revno: 99355 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 18:54:35 -0800 message: (semantic-idle-work-for-one-buffer): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-17 02:25:53 +0000 +++ lisp/ChangeLog 2010-01-17 02:54:35 +0000 @@ -1,3 +1,7 @@ +2010-01-17 Glenn Morris + + * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer): Doc fix. + 2010-01-17 Juanma Barranquero * cedet/semantic.el (semantic-mode): === modified file 'lisp/cedet/semantic/idle.el' --- lisp/cedet/semantic/idle.el 2010-01-16 02:51:50 +0000 +++ lisp/cedet/semantic/idle.el 2010-01-17 02:54:35 +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 ------------------------------------------------------------ revno: 99354 [merge] committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2010-01-17 03:30:13 +0100 message: Fix typos. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-01-04 18:18:38 +0000 +++ doc/lispref/ChangeLog 2010-01-17 02:25:53 +0000 @@ -1,3 +1,7 @@ +2010-01-17 Juanma Barranquero + + * two.el (volume-header-toc-markup): Fix typos in docstring. + 2010-01-04 Stefan Monnier Avoid dubious uses of save-excursions. === modified file 'doc/lispref/two.el' --- doc/lispref/two.el 2010-01-13 08:35:10 +0000 +++ doc/lispref/two.el 2010-01-17 02:25:53 +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") === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-16 02:51:50 +0000 +++ doc/misc/ChangeLog 2010-01-17 02:22:44 +0000 @@ -1,3 +1,8 @@ +2010-01-17 Juanma Barranquero + + * ede.texi (ede-step-project, ede-proj-target): + * tramp.texi (Remote processes): Fix typos. + 2010-01-16 Mario Lang * ede.texi (ede-target): === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2010-01-16 02:51:50 +0000 +++ doc/misc/ede.texi 2010-01-17 02:22:44 +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 === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2010-01-13 08:35:10 +0000 +++ doc/misc/tramp.texi 2010-01-17 02:22:44 +0000 @@ -2562,7 +2562,7 @@ @end example You will see the buffer @file{*Async Shell Command*}, containing the -continous output of the @command{tail} command. +continuous output of the @command{tail} command. @subsection Running eshell on a remote host === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 22:24:05 +0000 +++ lisp/ChangeLog 2010-01-17 02:25:53 +0000 @@ -1,3 +1,12 @@ +2010-01-17 Juanma Barranquero + + * 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 * nxml/nxml-mode.el (nxml-extend-after-change-region): Never === modified file 'lisp/cedet/ede/proj-aux.el' --- lisp/cedet/ede/proj-aux.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/ede/proj-aux.el 2010-01-17 02:24:22 +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. === modified file 'lisp/cedet/semantic.el' --- lisp/cedet/semantic.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/semantic.el 2010-01-17 02:25:53 +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) === modified file 'lisp/files.el' --- lisp/files.el 2010-01-13 08:35:10 +0000 +++ lisp/files.el 2010-01-17 02:25:53 +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"))) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-01-14 18:29:36 +0000 +++ lisp/gnus/ChangeLog 2010-01-17 02:25:53 +0000 @@ -1,3 +1,8 @@ +2010-01-17 Juanma Barranquero + + * nnmairix.el (nnmairix-group-delete-recreate-this-group): + Fix typo in docstring. + 2010-01-08 Jason Rumney * sieve-manage.el (sieve-manage-parse-capability-1): Loosely match OK === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/nnmairix.el 2010-01-17 02:25:53 +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)) === modified file 'lisp/textmodes/artist.el' --- lisp/textmodes/artist.el 2010-01-16 02:51:50 +0000 +++ lisp/textmodes/artist.el 2010-01-17 02:25:53 +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 === modified file 'src/atimer.h' --- src/atimer.h 2010-01-13 08:35:10 +0000 +++ src/atimer.h 2010-01-17 02:24:22 +0000 @@ -43,7 +43,7 @@ /* Timer is ripe at now plus an offset. */ ATIMER_RELATIVE, - /* Timer runs continously. */ + /* Timer runs continuously. */ ATIMER_CONTINUOUS }; ------------------------------------------------------------ revno: 99353 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 17:24:05 -0500 message: Fix return value of nxml-extend-after-change-region. * nxml/nxml-mode.el (nxml-extend-after-change-region): Never return t (Bug#3898). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 21:38:47 +0000 +++ lisp/ChangeLog 2010-01-16 22:24:05 +0000 @@ -1,3 +1,8 @@ +2010-01-16 Lennart Borgman + + * nxml/nxml-mode.el (nxml-extend-after-change-region): Never + return t (Bug#3898). + 2010-01-16 Frédéric Perrin (tiny change) * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we === modified file 'lisp/nxml/nxml-mode.el' --- lisp/nxml/nxml-mode.el 2010-01-13 08:35:10 +0000 +++ lisp/nxml/nxml-mode.el 2010-01-16 22:24:05 +0000 @@ -882,16 +882,17 @@ (defun nxml-extend-after-change-region (start end pre-change-length) (unless nxml-degraded (setq nxml-last-fontify-end nil) - - (nxml-with-degradation-on-error 'nxml-extend-after-change-region - (save-excursion - (save-restriction - (widen) - (save-match-data - (nxml-with-invisible-motion - (nxml-with-unmodifying-text-property-changes - (nxml-extend-after-change-region1 - start end pre-change-length))))))))) + (let ((region (nxml-with-degradation-on-error + 'nxml-extend-after-change-region + (save-excursion + (save-restriction + (widen) + (save-match-data + (nxml-with-invisible-motion + (nxml-with-unmodifying-text-property-changes + (nxml-extend-after-change-region1 + start end pre-change-length))))))))) + (if (consp region) region)))) (defun nxml-extend-after-change-region1 (start end pre-change-length) (let* ((region (nxml-after-change1 start end pre-change-length)) ------------------------------------------------------------ revno: 99352 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 16:38:47 -0500 message: * lisp/ChangeLog: Mark last change as tiny. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 21:37:46 +0000 +++ lisp/ChangeLog 2010-01-16 21:38:47 +0000 @@ -1,4 +1,4 @@ -2010-01-16 Frédéric Perrin +2010-01-16 Frédéric Perrin (tiny change) * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we can parse the output of the external commands (Bug#5279). ------------------------------------------------------------ revno: 99351 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 16:37:46 -0500 message: * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we can parse the output of the external commands (Bug#5279). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 21:20:43 +0000 +++ lisp/ChangeLog 2010-01-16 21:37:46 +0000 @@ -1,3 +1,8 @@ +2010-01-16 Frédéric Perrin + + * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we + can parse the output of the external commands (Bug#5279). + 2010-01-16 Jari Aalto * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix. === modified file 'lisp/vc-dispatcher.el' --- lisp/vc-dispatcher.el 2010-01-13 08:35:10 +0000 +++ lisp/vc-dispatcher.el 2010-01-16 21:37:46 +0000 @@ -320,11 +320,14 @@ (setq squeezed (nconc squeezed files))) (let ((exec-path (append vc-path exec-path)) ;; Add vc-path to PATH for the execution of this command. + ;; Also, since some functions need to parse the output + ;; from external commands, set LC_MESSAGES to C. (process-environment (cons (concat "PATH=" (getenv "PATH") path-separator (mapconcat 'identity vc-path path-separator)) - process-environment)) + (cons "LC_MESSAGES=C" + process-environment))) (w32-quote-process-args t)) (if (eq okstatus 'async) ;; Run asynchronously. ------------------------------------------------------------ revno: 99350 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 16:20:43 -0500 message: * emacs-lisp/advice.el (ad-add-advice): Doc fix (Bug#5274) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 20:50:23 +0000 +++ lisp/ChangeLog 2010-01-16 21:20:43 +0000 @@ -4,6 +4,8 @@ 2010-01-16 Chong Yidong + * emacs-lisp/advice.el (ad-add-advice): Doc fix (Bug#5274) + * emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267). * startup.el (command-line): Remove unused --icon-type arg. === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/advice.el 2010-01-16 21:20:43 +0000 @@ -2422,16 +2422,28 @@ ;;;###autoload (defun ad-add-advice (function advice class position) "Add a piece of ADVICE to FUNCTION's list of advices in CLASS. -If FUNCTION already has one or more pieces of advice of the specified -CLASS then POSITION determines where the new piece will go. The value -of POSITION can either be `first', `last' or a number where 0 corresponds -to `first'. Numbers outside the range will be mapped to the closest -extreme position. If there was already a piece of ADVICE with the same -name, then the position argument will be ignored and the old advice -will be overwritten with the new one. - If the FUNCTION was not advised already, then its advice info will be -initialized. Redefining a piece of advice whose name is part of the cache-id -will clear the cache." + +ADVICE has the form (NAME PROTECTED ENABLED DEFINITION), where +NAME is the advice name; PROTECTED is a flag specifying whether +to protect against non-local exits; ENABLED is a flag specifying +whether to initially enable the advice; and DEFINITION has the +form (advice . LAMBDA), where LAMBDA is a lambda expression. + +If FUNCTION already has a piece of advice with the same name, +then POSITION is ignored, and the old advice is overwritten with +the new one. + +If FUNCTION already has one or more pieces of advice of the +specified CLASS, then POSITION determines where the new piece +goes. POSITION can either be `first', `last' or a number (where +0 corresponds to `first', and numbers outside the valid range are +mapped to the closest extremal position). + +If FUNCTION was not advised already, its advice info will be +initialized. Redefining a piece of advice whose name is part of +the cache-id will clear the cache. + +See Info node `(elisp)Computed Advice' for detailed documentation." (cond ((not (ad-is-advised function)) (ad-initialize-advice-info function) (ad-set-advice-info-field ------------------------------------------------------------ revno: 99349 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 15:50:23 -0500 message: * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 20:04:29 +0000 +++ lisp/ChangeLog 2010-01-16 20:50:23 +0000 @@ -1,3 +1,7 @@ +2010-01-16 Jari Aalto + + * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix. + 2010-01-16 Chong Yidong * emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267). === modified file 'lisp/pcmpl-unix.el' --- lisp/pcmpl-unix.el 2010-01-13 08:35:10 +0000 +++ lisp/pcmpl-unix.el 2010-01-16 20:50:23 +0000 @@ -85,7 +85,10 @@ (while (pcomplete-here (funcall pcomplete-command-completion-function)))) (defun pcmpl-unix-read-passwd-file (file) - "Return an alist correlating gids to group names in FILE." + "Return an alist correlating gids to group names in FILE. + +If FILE is in hashed format (as described in the OpenSSH +documentation), this function returns nil." (let (names) (when (file-readable-p file) (with-temp-buffer ------------------------------------------------------------ revno: 99348 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 12:24:08 -0800 message: Update with Miles's advice on how to commit. diff: === modified file 'admin/notes/commits' --- admin/notes/commits 2010-01-16 20:18:30 +0000 +++ admin/notes/commits 2010-01-16 20:24:08 +0000 @@ -1,15 +1,53 @@ +HOW TO COMMIT CHANGES TO EMACS + +http://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00555.html +From: Miles Bader +Subject: commit style redux +Date: Tue, 31 Mar 2009 12:21:20 +0900 + +(1) Commit all changed files at once with a single log message (which + in CVS will result in an identical log message for all committed + files), not one-by-one. This is pretty easy using vc-dir now. + +(2) Make the log message describe the entire changeset, perhaps + including relevant changelog entiries (I often don't bother with + the latter if it's a trivial sort of change). + + Many modern source-control systems vaguely distinguish the first + line of the log message to use as a short summary for abbreviated + history listing (in arch this was explicitly called the summary, + but many other systems have a similar concept). So it's nice if + you can format the log entry like: + + SHORTISH ONE-LINE SUMMARY + + MULTIPLE-LINE DETAILED DESCRIPTION POSSIBLY INCLUDING (OR + CONSISTING OF) CHANGELOG ENTRIES + + [Even with CVS this style is useful, because web CVS browsing + interfaces often include the first N words of the log message of + the most recent commit as a short "most recent change" + description.] + +(3) Don't phrase log messages assuming the filename is known, because + in non-file-oriented systems (everything modern other than CVS), + the log listing tends to be treated as global information, and the + connection with specific files is less explicit. + + For instance, currently I often see log messages like "Regenerate"; + for modern source-control systems with a global log, it's better to + have something like "Regenerate configure". + + +Followup discussion: +http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html + + +PREVIOUS GUIDELINES FOR CVS + +For historical interest only, here is the old-style advice for CVS logs: http://lists.gnu.org/archive/html/emacs-devel/2007-12/msg01208.html From: Eli Zaretskii Subject: Re: Log messages in CVS Date: Sat, 29 Dec 2007 16:06:29 +0200 - -I once posted a summary that I know about; see: - - http://lists.gnu.org/archive/html/emacs-devel/2006-11/msg00229.html - http://lists.gnu.org/archive/html/emacs-devel/2006-11/msg00234.html - http://lists.gnu.org/archive/html/emacs-devel/2006-11/msg00312.html - -Richard commented here, basically approving my summary: - - http://lists.gnu.org/archive/html/emacs-devel/2006-11/msg00276.html ------------------------------------------------------------ revno: 99347 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 15:20:32 -0500 message: * xterm.c (event_handler_gdk): Block input (Bug#5037). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-16 19:28:59 +0000 +++ src/ChangeLog 2010-01-16 20:20:32 +0000 @@ -1,3 +1,7 @@ +2010-01-16 Stefan Monnier + + * xterm.c (event_handler_gdk): Block input (Bug#5037). + 2010-01-16 Chong Yidong * emacs.c (standard_args): Adjust arg priorities to reflect how === modified file 'src/xterm.c' --- src/xterm.c 2010-01-16 04:49:37 +0000 +++ src/xterm.c 2010-01-16 20:20:32 +0000 @@ -5797,6 +5797,7 @@ { XEvent *xev = (XEvent *) gxev; + BLOCK_INPUT; if (current_count >= 0) { struct x_display_info *dpyinfo; @@ -5807,23 +5808,27 @@ /* Filter events for the current X input method. GTK calls XFilterEvent but not for key press and release, so we do it here. */ - if (xev->type == KeyPress || xev->type == KeyRelease) - if (dpyinfo && x_filter_event (dpyinfo, xev)) - return GDK_FILTER_REMOVE; + if ((xev->type == KeyPress || xev->type == KeyRelease) + && dpyinfo + && x_filter_event (dpyinfo, xev)) + { + UNBLOCK_INPUT; + return GDK_FILTER_REMOVE; + } #endif if (! dpyinfo) current_finish = X_EVENT_NORMAL; else - { - current_count += - handle_one_xevent (dpyinfo, xev, ¤t_finish, - current_hold_quit); - } + current_count += + handle_one_xevent (dpyinfo, xev, ¤t_finish, + current_hold_quit); } else current_finish = x_dispatch_event (xev, xev->xany.display); + UNBLOCK_INPUT; + if (current_finish == X_EVENT_GOTO_OUT || current_finish == X_EVENT_DROP) return GDK_FILTER_REMOVE; ------------------------------------------------------------ revno: 99346 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-16 12:18:30 -0800 message: Rename from cvslogs to commits. diff: === renamed file 'admin/notes/cvslogs' => 'admin/notes/commits' ------------------------------------------------------------ revno: 99345 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 15:04:29 -0500 message: * emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 19:28:59 +0000 +++ lisp/ChangeLog 2010-01-16 20:04:29 +0000 @@ -1,5 +1,7 @@ 2010-01-16 Chong Yidong + * emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267). + * startup.el (command-line): Remove unused --icon-type arg. Handle --display arg, passing it to command-line-1 (Bug#5392). === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2010-01-13 12:34:53 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2010-01-16 20:04:29 +0000 @@ -282,7 +282,7 @@ ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "3867c0613dfd69780f561012a1dfe67b") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "e10a7e42199c08dc39460f67dd2d424b") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -672,11 +672,21 @@ (autoload 'defstruct "cl-macs" "\ Define a struct type. -This macro defines a new Lisp data type called NAME, which contains data -stored in SLOTs. This defines a `make-NAME' constructor, a `copy-NAME' -copier, a `NAME-p' predicate, and setf-able `NAME-SLOT' accessors. - -\(fn (NAME OPTIONS...) (SLOT SLOT-OPTS...)...)" nil (quote macro)) +This macro defines a new data type called NAME that stores data +in SLOTs. It defines a `make-NAME' constructor, a `copy-NAME' +copier, a `NAME-p' predicate, and slot accessors named `NAME-SLOT'. +You can use the accessors to set the corresponding slots, via `setf'. + +NAME may instead take the form (NAME OPTIONS...), where each +OPTION is either a single keyword or (KEYWORD VALUE). +See Info node `(cl)Structures' for a list of valid keywords. + +Each SLOT may instead take the form (SLOT SLOT-OPTS...), where +SLOT-OPTS are keyword-value pairs for that slot. Currently, only +one keyword is supported, `:read-only'. If this has a non-nil +value, that slot cannot be set via `setf'. + +\(fn NAME SLOTS...)" nil (quote macro)) (autoload 'cl-struct-setf-expander "cl-macs" "\ Not documented === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/cl-macs.el 2010-01-16 20:04:29 +0000 @@ -2191,11 +2191,21 @@ ;;;###autoload (defmacro defstruct (struct &rest descs) "Define a struct type. -This macro defines a new Lisp data type called NAME, which contains data -stored in SLOTs. This defines a `make-NAME' constructor, a `copy-NAME' -copier, a `NAME-p' predicate, and setf-able `NAME-SLOT' accessors. - -\(fn (NAME OPTIONS...) (SLOT SLOT-OPTS...)...)" +This macro defines a new data type called NAME that stores data +in SLOTs. It defines a `make-NAME' constructor, a `copy-NAME' +copier, a `NAME-p' predicate, and slot accessors named `NAME-SLOT'. +You can use the accessors to set the corresponding slots, via `setf'. + +NAME may instead take the form (NAME OPTIONS...), where each +OPTION is either a single keyword or (KEYWORD VALUE). +See Info node `(cl)Structures' for a list of valid keywords. + +Each SLOT may instead take the form (SLOT SLOT-OPTS...), where +SLOT-OPTS are keyword-value pairs for that slot. Currently, only +one keyword is supported, `:read-only'. If this has a non-nil +value, that slot cannot be set via `setf'. + +\(fn NAME SLOTS...)" (let* ((name (if (consp struct) (car struct) struct)) (opts (cdr-safe struct)) (slots nil) ------------------------------------------------------------ revno: 99344 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-16 14:28:59 -0500 message: Command line arg processing fix (Bug#5392) * src/emacs.c (standard_args): Adjust arg priorities to reflect how they are processed in startup.el. * lisp/startup.el (command-line): Remove unused --icon-type arg. Handle --display arg, passing it to command-line-1 (Bug#5392). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-16 02:51:50 +0000 +++ lisp/ChangeLog 2010-01-16 19:28:59 +0000 @@ -1,3 +1,8 @@ +2010-01-16 Chong Yidong + + * startup.el (command-line): Remove unused --icon-type arg. + Handle --display arg, passing it to command-line-1 (Bug#5392). + 2010-01-16 Mario Lang * cedet/ede/cpp-root.el (ede-cpp-root-project): === modified file 'lisp/startup.el' --- lisp/startup.el 2010-01-13 08:35:10 +0000 +++ lisp/startup.el 2010-01-16 19:28:59 +0000 @@ -758,7 +758,8 @@ (pop args))) (let ((done nil) - (args (cdr command-line-args))) + (args (cdr command-line-args)) + display-arg) ;; Figure out which user's init file to load, ;; either from the environment or from the options. @@ -794,6 +795,11 @@ (setq argval nil argi orig-argi))))) (cond + ;; The --display arg is handled partly in C, partly in Lisp. + ;; When it shows up here, we just put it back to be handled + ;; by `command-line-1'. + ((member argi '("-d" "-display")) + (setq display-arg (list argi (pop args)))) ((member argi '("-Q" "-quick")) (setq init-file-user nil site-run-file nil @@ -813,8 +819,6 @@ (setq init-file-debug t)) ((equal argi "-iconic") (push '(visibility . icon) initial-frame-alist)) - ((member argi '("-icon-type" "-i" "-itype")) - (push '(icon-type . t) default-frame-alist)) ((member argi '("-nbc" "-no-blinking-cursor")) (setq no-blinking-cursor t)) ;; Push the popped arg back on the list of arguments. @@ -825,6 +829,9 @@ (and argval (error "Option `%s' doesn't allow an argument" argi)))) + ;; Re-attach the --display arg. + (and display-arg (setq args (append display-arg args))) + ;; Re-attach the program name to the front of the arg list. (and command-line-args (setcdr command-line-args args))) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-16 09:40:57 +0000 +++ src/ChangeLog 2010-01-16 19:28:59 +0000 @@ -1,3 +1,8 @@ +2010-01-16 Chong Yidong + + * emacs.c (standard_args): Adjust arg priorities to reflect how + they are processed in startup.el. + 2010-01-16 Andreas Schwab * Makefile.in (lisp, shortlisp): Update. === modified file 'src/emacs.c' --- src/emacs.c 2010-01-13 15:38:28 +0000 +++ src/emacs.c 2010-01-16 19:28:59 +0000 @@ -1869,7 +1869,7 @@ /* -d must come last before the options handled in startup.el. */ { "-d", "--display", 60, 1 }, { "-display", 0, 60, 1 }, - /* Now for the options handled in startup.el. */ + /* Now for the options handled in `command-line' (startup.el). */ { "-Q", "--quick", 55, 0 }, { "-quick", 0, 55, 0 }, { "-q", "--no-init-file", 50, 0 }, @@ -1878,10 +1878,12 @@ { "-u", "--user", 30, 1 }, { "-user", 0, 30, 1 }, { "-debug-init", "--debug-init", 20, 0 }, - { "-nbi", "--no-bitmap-icon", 15, 0 }, { "-iconic", "--iconic", 15, 0 }, { "-D", "--basic-display", 12, 0}, { "-basic-display", 0, 12, 0}, + { "-nbc", "--no-blinking-cursor", 12, 0 }, + /* Now for the options handled in `command-line-1' (startup.el). */ + { "-nbi", "--no-bitmap-icon", 10, 0 }, { "-bg", "--background-color", 10, 1 }, { "-background", 0, 10, 1 }, { "-fg", "--foreground-color", 10, 1 }, @@ -1891,7 +1893,6 @@ { "-ib", "--internal-border", 10, 1 }, { "-ms", "--mouse-color", 10, 1 }, { "-cr", "--cursor-color", 10, 1 }, - { "-nbc", "--no-blinking-cursor", 10, 0 }, { "-fn", "--font", 10, 1 }, { "-font", 0, 10, 1 }, { "-fs", "--fullscreen", 10, 0 }, ------------------------------------------------------------ revno: 99343 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-01-16 06:58:42 -0500 message: Reformat copyright line. diff: === modified file 'src/xdisp.c' --- src/xdisp.c 2010-01-15 05:09:50 +0000 +++ src/xdisp.c 2010-01-16 11:58:42 +0000 @@ -1,7 +1,8 @@ /* Display generation from window structure and buffer text. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. ------------------------------------------------------------ revno: 99342 committer: Andreas Schwab branch nick: emacs timestamp: Sat 2010-01-16 10:40:57 +0100 message: Update $(lisp) and $(shortlisp) to match changes in loadup.el * Makefile.in (lisp, shortlisp): Update. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-16 04:49:37 +0000 +++ src/ChangeLog 2010-01-16 09:40:57 +0000 @@ -1,3 +1,7 @@ +2010-01-16 Andreas Schwab + + * Makefile.in (lisp, shortlisp): Update. + 2010-01-16 Stefan Monnier * xterm.c (x_term_init): Instead of inhibiting GC while running Lisp === modified file 'src/Makefile.in' --- src/Makefile.in 2010-01-13 08:35:10 +0000 +++ src/Makefile.in 2010-01-16 09:40:57 +0000 @@ -736,13 +736,13 @@ ${lispsource}emacs-lisp/map-ynp.elc \ ${lispsource}menu-bar.elc \ ${lispsource}international/mule.elc \ - ${lispsource}international/mule-conf.el \ + ${lispsource}international/mule-conf.elc \ ${lispsource}international/mule-cmds.elc \ ${lispsource}international/characters.elc \ ${lispsource}international/charprop.el \ ${lispsource}case-table.elc \ - ${lispsource}language/chinese.el \ - ${lispsource}language/cyrillic.el \ + ${lispsource}language/chinese.elc \ + ${lispsource}language/cyrillic.elc \ ${lispsource}language/indian.elc \ ${lispsource}language/sinhala.el \ ${lispsource}language/english.el \ @@ -760,7 +760,7 @@ ${lispsource}language/tai-viet.el \ ${lispsource}language/thai.el \ ${lispsource}language/tibetan.elc \ - ${lispsource}language/vietnamese.el \ + ${lispsource}language/vietnamese.elc \ ${lispsource}language/misc-lang.el \ ${lispsource}language/utf-8-lang.el \ ${lispsource}language/georgian.el \ @@ -829,12 +829,12 @@ ../lisp/emacs-lisp/map-ynp.elc \ ../lisp/env.elc \ ../lisp/international/mule.elc \ - ../lisp/international/mule-conf.el \ + ../lisp/international/mule-conf.elc \ ../lisp/international/mule-cmds.elc \ ../lisp/international/characters.elc \ ../lisp/case-table.elc \ - ../lisp/language/chinese.el \ - ../lisp/language/cyrillic.el \ + ../lisp/language/chinese.elc \ + ../lisp/language/cyrillic.elc \ ../lisp/language/indian.elc \ ../lisp/language/sinhala.el \ ../lisp/language/english.el \ @@ -852,7 +852,7 @@ ../lisp/language/tai-viet.el \ ../lisp/language/thai.el \ ../lisp/language/tibetan.elc \ - ../lisp/language/vietnamese.el \ + ../lisp/language/vietnamese.elc \ ../lisp/language/misc-lang.el \ ../lisp/language/utf-8-lang.el \ ../lisp/language/georgian.el \ ------------------------------------------------------------ revno: 99341 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2010-01-15 23:49:37 -0500 message: (x_term_init): Instead of inhibiting GC while running Lisp code, link the new kboard into all_kboard before running Lisp code, and protect the new terminal with GCPRO (Bug#5365). (x_term_init): Remove unused var `atom'. (x_delete_display, x_delete_terminal): Remove unused var `i'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-15 17:04:14 +0000 +++ src/ChangeLog 2010-01-16 04:49:37 +0000 @@ -1,3 +1,11 @@ +2010-01-16 Stefan Monnier + + * xterm.c (x_term_init): Instead of inhibiting GC while running Lisp + code, link the new kboard into all_kboard before running Lisp code, + and protect the new terminal with GCPRO (Bug#5365). + (x_term_init): Remove unused var `atom'. + (x_delete_display, x_delete_terminal): Remove unused var `i'. + 2010-01-15 Jan Djärv * xfns.c (x_get_current_desktop, x_get_desktop_workarea): New functions. === modified file 'src/xterm.c' --- src/xterm.c 2010-01-13 18:35:36 +0000 +++ src/xterm.c 2010-01-16 04:49:37 +0000 @@ -9821,7 +9821,7 @@ { Pixmap icon_pixmap, icon_mask; -#ifndef USE_X_TOOLKIT +#if !defined USE_X_TOOLKIT && !defined USE_GTK Window window = FRAME_OUTER_WINDOW (f); #endif @@ -10076,7 +10076,6 @@ int argc; char *argv[NUM_ARGV]; char **argv2 = argv; - GdkAtom atom; guint id; #ifndef HAVE_GTK_MULTIDISPLAY if (!EQ (Vinitial_window_system, Qx)) @@ -10215,25 +10214,36 @@ terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (terminal->kboard); terminal->kboard->Vwindow_system = Qx; + + /* Add the keyboard to the list before running Lisp code (via + Qvendor_specific_keysyms below), since these are not traced + via terminals but only through all_kboards. */ + terminal->kboard->next_kboard = all_kboards; + all_kboards = terminal->kboard; + if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) { char *vendor = ServerVendor (dpy); - /* Temporarily hide the partially initialized terminal, - but make sure it doesn't get garbage collected. */ - int count = inhibit_garbage_collection (); + + /* Protect terminal from GC before removing it from the + list of terminals. */ + struct gcpro gcpro1; + Lisp_Object gcpro_term; + XSETTERMINAL (gcpro_term, terminal); + GCPRO1 (gcpro_term); + + /* Temporarily hide the partially initialized terminal. */ terminal_list = terminal->next_terminal; UNBLOCK_INPUT; terminal->kboard->Vsystem_key_alist = call1 (Qvendor_specific_keysyms, vendor ? build_string (vendor) : empty_unibyte_string); BLOCK_INPUT; - unbind_to (count, Qnil); terminal->next_terminal = terminal_list; terminal_list = terminal; + UNGCPRO; } - terminal->kboard->next_kboard = all_kboards; - all_kboards = terminal->kboard; /* Don't let the initial kboard remain current longer than necessary. That would cause problems if a file loaded on startup tries to prompt in the mini-buffer. */ @@ -10582,7 +10592,6 @@ x_delete_display (dpyinfo) struct x_display_info *dpyinfo; { - int i; struct terminal *t; /* Close all frames and delete the generic struct terminal for this @@ -10734,7 +10743,6 @@ x_delete_terminal (struct terminal *terminal) { struct x_display_info *dpyinfo = terminal->display_info.x; - int i; /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.