Now on revision 107345. ------------------------------------------------------------ revno: 107345 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2012-02-20 07:54:56 +0000 message: nnimap.el: IMAP command logging improvement; When moving articles between IMAP servers, delete from the correct server diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-19 23:55:16 +0000 +++ lisp/gnus/ChangeLog 2012-02-20 07:54:56 +0000 @@ -1,3 +1,10 @@ +2012-02-20 Lars Ingebrigtsen + + * nnimap.el (nnimap-log-command): Add the IMAP address to the log + buffer. Suggested by Herbert Valerio Riedel. + (nnimap-request-move-article): Delete the message from the correct IMAP + server. + 2012-02-19 Vida Gábor (tiny change) * gnus-demon.el (gnus-demon-init): Don't multiply time twice. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2012-02-13 22:18:33 +0000 +++ lisp/gnus/nnimap.el 2012-02-20 07:54:56 +0000 @@ -868,6 +868,7 @@ ;; Move the article to a different method. (let ((result (eval accept-form))) (when result + (nnimap-possibly-change-group group server) (nnimap-delete-article article) result))))))) @@ -1706,7 +1707,8 @@ (when nnimap-record-commands (with-current-buffer (get-buffer-create "*imap log*") (goto-char (point-max)) - (insert (format-time-string "%H:%M:%S") " " + (insert (format-time-string "%H:%M:%S") + " [" nnimap-address "] " (if nnimap-inhibit-logging "(inhibited)\n" command)))) ------------------------------------------------------------ revno: 107344 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-02-19 17:55:34 -0800 message: Fix author comment diff: === modified file 'lisp/net/rcompile.el' --- lisp/net/rcompile.el 2012-01-19 07:21:25 +0000 +++ lisp/net/rcompile.el 2012-02-20 01:55:34 +0000 @@ -1,8 +1,8 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. -;; Author: Albert +;; Author: Alon Albert ;; Maintainer: FSF ;; Created: 1993 Oct 6 ;; Keywords: tools, processes ------------------------------------------------------------ revno: 107343 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-02-19 17:34:19 -0800 message: * doc/emacs/emacs.texi (Distrib): Small updates. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-20 01:19:06 +0000 +++ doc/emacs/ChangeLog 2012-02-20 01:34:19 +0000 @@ -3,6 +3,7 @@ * ack.texi (Acknowledgments): More updates. * emacs.texi (Acknowledgments): Add several names from ack.texi. + (Distrib): Small updates. 2012-02-18 Glenn Morris === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2012-02-20 01:18:07 +0000 +++ doc/emacs/emacs.texi 2012-02-20 01:34:19 +0000 @@ -11,7 +11,7 @@ This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* updated for Emacs version @value{EMACSVER}. -Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc. +Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1237,7 +1237,7 @@ @unnumbered Distribution GNU Emacs is @dfn{free software}; this means that everyone is free to -use it and free to redistribute it on certain conditions. GNU Emacs +use it and free to redistribute it under certain conditions. GNU Emacs is not in the public domain; it is copyrighted and there are restrictions on its distribution, but these restrictions are designed to permit everything that a good cooperating citizen would want to do. @@ -1245,11 +1245,10 @@ any version of GNU Emacs that they might get from you. The precise conditions are found in the GNU General Public License that comes with Emacs and also appears in this manual@footnote{This manual is itself -covered by the GNU Free Documentation License (see the reverse title -page in the printed manual or view the full source for online formats -to see the precise conditions). This license is similar in spirit to -the General Public License, but is more suitable for documentation. -@xref{GNU Free Documentation License}.}. @xref{Copying}. +covered by the GNU Free Documentation License. This license is +similar in spirit to the General Public License, but is more suitable +for documentation. @xref{GNU Free Documentation License}.}. +@xref{Copying}. One way to get a copy of GNU Emacs is from someone else who has it. You need not ask for our permission to do so, or tell any one else; @@ -1266,14 +1265,22 @@ General Public License. In other words, the program must be free for you when you get it, not just free for the manufacturer. -@c FIXME no longer true? -You can also order copies of GNU Emacs from the Free Software -Foundation. This is a convenient and reliable way to get a copy; it is -also a good way to help fund our work. We also sell hardcopy versions -of this manual and @cite{An Introduction to Programming in Emacs Lisp}, -by Robert J. Chassell. You can visit our online store at -@url{http://shop.fsf.org/}. For further information, -write to +If you find GNU Emacs useful, please @strong{send a donation} to the +Free Software Foundation to support our work. Donations to the Free +Software Foundation are tax deductible in the US. If you use GNU Emacs +at your workplace, please suggest that the company make a donation. +For more information on how you can help, see +@url{http://www.gnu.org/help/help.html}. + +We also sell hardcopy versions of this manual and @cite{An +Introduction to Programming in Emacs Lisp}, by Robert J.@: Chassell. +You can visit our online store at @url{http://shop.fsf.org/}. +The income from sales goes to support the foundation's purpose: the +development of new free software, and improvements to our existing +programs including GNU Emacs. + +If you need to contact the Free Software Foundation, see +@url{http://www.fsf.org/about/contact/}, or write to @display Free Software Foundation @@ -1282,19 +1289,6 @@ USA @end display -The income from sales goes to support the foundation's purpose: the -development of new free software, and improvements to our existing -programs including GNU Emacs. - -@c FIXME you can't order a CD any more. -If you find GNU Emacs useful, please @strong{send a donation} to the -Free Software Foundation to support our work. Donations to the Free -Software Foundation are tax deductible in the US. If you use GNU Emacs -at your workplace, please suggest that the company make a donation. If -company policy is unsympathetic to the idea of donating to charity, you -might instead suggest ordering a CD-ROM from the Foundation -occasionally, or subscribing to periodic updates. - @iftex @node Acknowledgments, Intro, Distrib, Top @unnumberedsec Acknowledgments ------------------------------------------------------------ revno: 107342 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-02-19 17:19:06 -0800 message: * doc/emacs/ack.texi (Acknowledgments): More updates. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-20 01:17:22 +0000 +++ doc/emacs/ChangeLog 2012-02-20 01:19:06 +0000 @@ -1,5 +1,7 @@ 2012-02-20 Glenn Morris + * ack.texi (Acknowledgments): More updates. + * emacs.texi (Acknowledgments): Add several names from ack.texi. 2012-02-18 Glenn Morris === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2012-02-18 22:19:42 +0000 +++ doc/emacs/ack.texi 2012-02-20 01:19:06 +0000 @@ -74,7 +74,8 @@ @code{read-file-name} input; @file{mb-depth.el}, display of minibuffer depth; @file{button.el}, the library that implements clickable buttons; @file{face-remap.el}, a package for changing the default face in -individual buffers; and @file{macroexp.el} for macro-expansion. +individual buffers; and @file{macroexp.el} for macro-expansion. He +also worked on an early version of the lexical-binding code. @item David Bakhash wrote @file{strokes.el}, a mode for controlling Emacs by @@ -185,7 +186,8 @@ @item Bob Chassell wrote @file{texnfo-upd.el}, @file{texinfo.el}, and @file{makeinfo.el}, modes and utilities for working with Texinfo files; -and @file{page-ext.el}, commands for extended page handling. +and @file{page-ext.el}, commands for extended page handling. He also +wrote the ``Introduction to programming in Emacs Lisp'' manual. @item Jihyun Cho wrote @file{hanja-util.el} and @file{hangul.el}, utilities @@ -198,7 +200,8 @@ @item Chong Yidong was the Emacs co-maintainer from Emacs 23 onwards. He made many improvements to the Emacs display engine. He also wrote -@file{tabulated-list.el}, a generic major mode for lists of data. +@file{tabulated-list.el}, a generic major mode for lists of data; +and improved support for themes and packages. @item James Clark wrote SGML mode, a mode for editing SGML documents; and @@ -502,7 +505,8 @@ @file{netrc.el} for parsing of @file{.netrc} files; and @file{time-date.el} for general date and time handling. He also wrote @file{network-stream.el}, for opening network processes; -and @file{url-queue.el}, for controlling parallel downloads of URLs. +@file{url-queue.el}, for controlling parallel downloads of URLs; +and implemented libxml2 support. Components of Gnus have also been written by: Nagy Andras, David Blacka, Scott Byer, Ludovic Courtès, Julien Danjou, Kevin Greiner, Kai Großjohann, Joe Hildebrand, Paul Jarc, Simon Josefsson, Sascha @@ -831,7 +835,8 @@ diffs; @file{css-mode.el} for Cascading Style Sheets; @file{bibtex-style.el} for BibTeX Style files; @file{mpc.el}, a client for the ``Music Player Daemon''; and @file{pcase.el}, -implementing ML-style pattern matching. +implementing ML-style pattern matching. He integrated the +lexical-binding code in Emacs 24. @item Morioka Tomohiko wrote several packages for MIME support in Gnus and @@ -1041,6 +1046,9 @@ DSSSL code. @item +Martin Rudalics implemented improved display-buffer handling in Emacs 24. + +@item Ivar Rummelhoff wrote @file{winner.el}, which records recent window configurations so you can move back to them. @@ -1279,6 +1287,9 @@ (q.v.@:). @item +Joakim Verona implemented ImageMagick support. + +@item Ulrik Vieth implemented @file{meta-mode.el}, for editing MetaFont code. @item @@ -1399,7 +1410,7 @@ Eli Zaretskii made many standard Emacs features work on MS-DOS and Microsoft Windows. He also wrote @file{tty-colors.el}, which implements transparent mapping of X colors to tty colors; and -@file{rxvt.el}. +@file{rxvt.el}. He implemented support for bidirectional text. @item Jamie Zawinski wrote much of the support for faces and X selections. ------------------------------------------------------------ revno: 107341 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-02-19 17:18:07 -0800 message: Re-fill acknowledged authors diff: === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2012-02-20 01:17:22 +0000 +++ doc/emacs/emacs.texi 2012-02-20 01:18:07 +0000 @@ -1303,86 +1303,96 @@ Abrahamsson, Jay K.@: Adams, Michael Albinus, Nagy Andras, Ralf Angeli, Joe Arceneaux, Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas Baumann, Steven L.@: Baur, Jay Belanger, -Alexander L.@: Belikoff, Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl Berry, Anna M.@: Bigatti, -Ray Blaak, Martin Blais, Jim Blandy, Johan Bockgård, Jan Böcker, Lennart Borgman, -Per Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel -Briot, Kevin Broadey, Vincent Broman, Michael Brouwer, David M.@: Brown, Georges -Brun-Cottan, Joe Buehler, W@l{}odek Bzyl, Bill Carpenter, Per +Alexander L.@: Belikoff, Thomas Bellman, Scott Bender, Boaz Ben-Zvi, +Sergey Berezin, Karl Berry, Anna M.@: Bigatti, Ray Blaak, Martin +Blais, Jim Blandy, Johan Bockgård, Jan Böcker, Lennart Borgman, Per +Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, +Kevin Broadey, Vincent Broman, Michael Brouwer, David M.@: Brown, +Georges Brun-Cottan, Joe Buehler, W@l{}odek Bzyl, Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chong Yidong, Chris Chase, Bob Chassell, -Andrew Choi, Sacha Chua, James Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, -Daniel Colascione, Ludovic Courtès, Andrew Csillag, Baoqiu Cui, Doug -Cutting, Mathias Dahl, Julien Danjou, Satyaki Das, Vivek Dasmohapatra, -Michael DeCorte, Gary Delp, Matthieu Devin, Christophe de Dinechin, Eri Ding, Jan Djärv, -Carsten Dominik, Scott Draves, Benjamin Drieu, Viktor Dukhovni, Dmitry -Dzhus, John Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen Eglen, Torbjörn -Einarsson, Tsugutomo Enami, David Engster, Hans Henrik Eriksen, Michael Ernst, Ata -Etemadi, Frederick Farnbach, Oscar Figueiredo, Fred Fish, Karl Fogel, -Gary Foster, Romain Francoise, Noah Friedman, Andreas Fuchs, Shigeru Fukaya, Hallvard -Furuseth, Keith Gabryelski, Peter S.@: Galbraith, Kevin Gallagher, -Kevin Gallo, Juan León Lahoz García, Howard Gayle, Daniel German, -Stephen Gildea, Julien Gilles, David Gillespie, Bob Glickstein, Deepak -Goel, Boris Goldowsky, David Goodger, Michelangelo Grigni, Odd Gripenstam, Kai -Großjohann, Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug -Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris Hanson, Jesper Harder, +Andrew Choi, Sacha Chua, James Clark, Mike Clarkson, Glynn Clements, +Andrew Cohen, Daniel Colascione, Ludovic Courtès, Andrew Csillag, +Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki Das, +Vivek Dasmohapatra, Michael DeCorte, Gary Delp, Matthieu Devin, +Christophe de Dinechin, Eri Ding, Jan Djärv, Carsten Dominik, Scott +Draves, Benjamin Drieu, Viktor Dukhovni, Dmitry Dzhus, John Eaton, +Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen Eglen, +Torbjörn Einarsson, Tsugutomo Enami, David Engster, Hans Henrik +Eriksen, Michael Ernst, Ata Etemadi, Frederick Farnbach, Oscar +Figueiredo, Fred Fish, Karl Fogel, Gary Foster, Romain Francoise, Noah +Friedman, Andreas Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith +Gabryelski, Peter S.@: Galbraith, Kevin Gallagher, Kevin Gallo, Juan +León Lahoz García, Howard Gayle, Daniel German, Stephen Gildea, Julien +Gilles, David Gillespie, Bob Glickstein, Deepak Goel, Boris Goldowsky, +David Goodger, Michelangelo Grigni, Odd Gripenstam, Kai Großjohann, +Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug Gwyn, Bruno +Haible, Ken'ichi Handa, Lars Hansen, Chris Hanson, Jesper Harder, Alexandru Harsanyi, K.@: Shane Hartman, John Heidemann, Jon K.@: -Hellan, Magnus Henoch, Markus Heritsch, Dirk Herrmann, Karl Heuer, Manabu Higashida, -Anders Holst, Jeffrey C.@: Honig, Tassilo Horn, Kurt Hornik, Tom -Houlder, Joakim Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, -Seiichiro Inoue, Philip Jackson, Pavel Janik, Paul Jarc, Ulf Jasper, -Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon Josefsson, Alexandre Julliard, Arne -Jørgensen, Tomoji Kagatani, Brewster Kahle, Tokuya Kameshima, Lute -Kamstra, Ivan Kanis, David Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, -Taro Kawagishi, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel +Hellan, Magnus Henoch, Markus Heritsch, Dirk Herrmann, Karl Heuer, +Manabu Higashida, Anders Holst, Jeffrey C.@: Honig, Tassilo Horn, Kurt +Hornik, Tom Houlder, Joakim Hove, Denis Howe, Lars Ingebrigtsen, +Andrew Innes, Seiichiro Inoue, Philip Jackson, Pavel Janik, Paul Jarc, +Ulf Jasper, Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon +Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani, +Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Ivan Kanis, David +Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi, +Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K.@: Kolodney, David M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer, Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose -Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian Limpach, Lars -Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, -Francis Litterio, Emilio C.@: Lopes, Károly L@H{o}rentey, Martin Lorentzon, Dave Love, -Sascha Lüdecke, Eric Ludlam, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, Christopher J.@: Madsen, -Neil M.@: Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon -Marshall, Bengt Martensson, Charlie Martin, Yukihiro Matsumoto, Thomas May, Will Mengarini, David Megginson, Stefan Merten, Ben A.@: Mesander, Wayne -Mesard, Brad Miller, Lawrence Mitchell, Richard Mlynarik, Gerd -Moellmann, Stefan Monnier, Morioka Tomohiko, Keith Moore, Jan -Moringen, Glenn Morris, Diane Murray, Sen Nagata, Gergely Nagy, Erik Naggum, Nobuyoshi Nakada, Thomas -Neumann, Thien-Thi Nguyen, Mike Newton, Jurgen Nickelsen, Dan -Nicolaescu, Hrvoje Niksic, Jeff Norden, Andrew Norman, Edward O'Connor, Kentaro Ohkouchi, Christian +Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian +Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, +Juri Linkov, Francis Litterio, Emilio C.@: Lopes, Károly L@H{o}rentey, +Martin Lorentzon, Dave Love, Sascha Lüdecke, Eric Ludlam, Greg McGary, +Roland McGrath, Michael McNamara, Alan Mackenzie, Christopher J.@: +Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon +Marshall, Bengt Martensson, Charlie Martin, Yukihiro Matsumoto, Thomas +May, Will Mengarini, David Megginson, Stefan Merten, Ben A.@: +Mesander, Wayne Mesard, Brad Miller, Lawrence Mitchell, Richard +Mlynarik, Gerd Moellmann, Stefan Monnier, Morioka Tomohiko, Keith +Moore, Jan Moringen, Glenn Morris, Diane Murray, Sen Nagata, Gergely +Nagy, Erik Naggum, Nobuyoshi Nakada, Thomas Neumann, Thien-Thi Nguyen, +Mike Newton, Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff +Norden, Andrew Norman, Edward O'Connor, Kentaro Ohkouchi, Christian Ohler, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota, Pieter E.@: J.@: Pareit, Ross Patterson, David Pearson, Jeff Peck, Damon Anton Permezel, Tom Perrine, William M.@: Perry, Per Persson, Jens -Petersen, Daniel Pfeiffer, Richard L.@: Pieri, Fred Pierresteguy, François Pinard, -Christian Plaunt, David Ponce, Francesco A.@: Potorti, Michael D.@: -Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin Ram, Eric -S.@: Raymond, Paul Reilly, Edward M.@: Reingold, Alex Rezinsky, Rob -Riepel, David Reitter, Adrian Robert, Nick Roberts, Roland B.@: -Roberts, John Robinson, Danny Roozendaal, Sebastian Rose, William -Rosenblatt, Markus Rost, Guillermo J.@: Rozas, Martin Rudalics, Ivar Rummelhoff, -Jason Rumney, Wolfgang Rupprecht, Kevin Ryde, James B.@: Salem, -Masahiko Sato, Timo Savola, Jorgen Schaefer, Holger Schauer, William Schelter, -Ralph Schleicher, Gregor Schmid, Michael Schmidt, Ronald S.@: Schnell, -Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Rainer Schoepf, Stefan Schoef, -Raymond Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver -Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham, Stanislav -Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor @v{S}imko, Espen Skoglund, -Rick Sladkey, Lynn Slater, Chris Smith, David Smith, Paul D.@: Smith, Wilson Snyder, -William Sommerfeld, Andre Spiegel, Michael Staats, Ulf Stegemann, -Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken -Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.@: -Storm, Steve Strassmann, Olaf Sylvester, Naoto Takahashi, Steven Tamm, -Luc Teirlinck, Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas, -Jim Thompson, Toru Tomabechi, David O'Toole, Markus Triska, Tom Tromey, Enami -Tsugutomo, Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh -Vaidheeswarran, Neil W.@: Van Dyke, Didier Verna, Joakim Verona, Ulrik -Vieth, Geoffrey Voelker, Johan Vromans, Inge Wallin, John Paul -Wallington, Colin Walters, Barry Warsaw, Christoph Wedler, Morten Welinder, Joseph Brian -Wells, Rodney Whitby, John Wiegley, Ed Wilkinson, Mike Williams, Roland Winkler, Bill -Wohler, Steven A.@: Wood, Dale R.@: Worley, Francis J.@: Wright, Felix -S.@: T.@: Wu, Tom Wurgler, Katsumi Yamaoka, Yamamoto Mitsuharu, -Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan -Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin, Shenghuo Zhu, -Piotr Zielinski, Ian T.@: Zimmermann, Reto Zimmermann, Neal Ziring, -Teodor Zlatanov, and Detlev Zundel. +Petersen, Daniel Pfeiffer, Richard L.@: Pieri, Fred Pierresteguy, +François Pinard, Christian Plaunt, David Ponce, Francesco A.@: +Potorti, Michael D.@: Prange, Mukesh Prasad, Ken Raeburn, Marko +Rahamaa, Ashwin Ram, Eric S.@: Raymond, Paul Reilly, Edward M.@: +Reingold, Alex Rezinsky, Rob Riepel, David Reitter, Adrian Robert, +Nick Roberts, Roland B.@: Roberts, John Robinson, Danny Roozendaal, +Sebastian Rose, William Rosenblatt, Markus Rost, Guillermo J.@: Rozas, +Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang Rupprecht, +Kevin Ryde, James B.@: Salem, Masahiko Sato, Timo Savola, Jorgen +Schaefer, Holger Schauer, William Schelter, Ralph Schleicher, Gregor +Schmid, Michael Schmidt, Ronald S.@: Schnell, Philippe Schnoebelen, +Jan Schormann, Alex Schroeder, Rainer Schoepf, Stefan Schoef, Raymond +Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel, +Manuel Serrano, Paul Sexton, Hovav Shacham, Stanislav Shalunov, Marc +Shapiro, Richard Sharman, Olin Shivers, Tibor @v{S}imko, Espen +Skoglund, Rick Sladkey, Lynn Slater, Chris Smith, David Smith, Paul +D.@: Smith, Wilson Snyder, William Sommerfeld, Andre Spiegel, Michael +Staats, Ulf Stegemann, Reiner Steib, Sam Steingold, Ake Stenhoff, +Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan Stigelman, +Martin Stjernholm, Kim F.@: Storm, Steve Strassmann, Olaf Sylvester, +Naoto Takahashi, Steven Tamm, Luc Teirlinck, Jean-Philippe Theberge, +Jens T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Toru +Tomabechi, David O'Toole, Markus Triska, Tom Tromey, Enami Tsugutomo, +Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil +W.@: Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey +Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin +Walters, Barry Warsaw, Christoph Wedler, Morten Welinder, Joseph Brian +Wells, Rodney Whitby, John Wiegley, Ed Wilkinson, Mike Williams, +Roland Winkler, Bill Wohler, Steven A.@: Wood, Dale R.@: Worley, +Francis J.@: Wright, Felix S.@: T.@: Wu, Tom Wurgler, Katsumi Yamaoka, +Yamamoto Mitsuharu, Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya +Zakharevich, Milan Zamazal, Victor Zandy, Eli Zaretskii, Jamie +Zawinski, Andrew Zhilin, Shenghuo Zhu, Piotr Zielinski, Ian T.@: +Zimmermann, Reto Zimmermann, Neal Ziring, Teodor Zlatanov, and Detlev +Zundel. @end iftex @node Intro, Glossary, Distrib, Top ------------------------------------------------------------ revno: 107340 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-02-19 17:17:22 -0800 message: * doc/emacs/emacs.texi (Acknowledgments): Add several names from ack.texi. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-02-18 22:19:42 +0000 +++ doc/emacs/ChangeLog 2012-02-20 01:17:22 +0000 @@ -1,3 +1,7 @@ +2012-02-20 Glenn Morris + + * emacs.texi (Acknowledgments): Add several names from ack.texi. + 2012-02-18 Glenn Morris * ack.texi (Acknowledgments): Add xref to Org manual. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2012-02-12 02:28:30 +0000 +++ doc/emacs/emacs.texi 2012-02-20 01:17:22 +0000 @@ -1303,85 +1303,84 @@ Abrahamsson, Jay K.@: Adams, Michael Albinus, Nagy Andras, Ralf Angeli, Joe Arceneaux, Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas Baumann, Steven L.@: Baur, Jay Belanger, -Alexander L.@: Belikoff, Boaz Ben-Zvi, Karl Berry, Anna M.@: Bigatti, -Ray Blaak, Jim Blandy, Johan Bockgård, Jan Böcker, Lennart Borgman, +Alexander L.@: Belikoff, Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl Berry, Anna M.@: Bigatti, +Ray Blaak, Martin Blais, Jim Blandy, Johan Bockgård, Jan Böcker, Lennart Borgman, Per Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel -Briot, Kevin Broadey, Vincent Broman, David M.@: Brown, Georges +Briot, Kevin Broadey, Vincent Broman, Michael Brouwer, David M.@: Brown, Georges Brun-Cottan, Joe Buehler, W@l{}odek Bzyl, Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chong Yidong, Chris Chase, Bob Chassell, -Andrew Choi, Sacha Chua, James Clark, Mike Clarkson, Glynn Clements, +Andrew Choi, Sacha Chua, James Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione, Ludovic Courtès, Andrew Csillag, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki Das, Vivek Dasmohapatra, -Michael DeCorte, Gary Delp, Matthieu Devin, Eri Ding, Jan Djärv, +Michael DeCorte, Gary Delp, Matthieu Devin, Christophe de Dinechin, Eri Ding, Jan Djärv, Carsten Dominik, Scott Draves, Benjamin Drieu, Viktor Dukhovni, Dmitry -Dzhus, John Eaton, Rolf Ebert, Paul Eggert, Stephen Eglen, Torbjörn -Einarsson, Tsugutomo Enami, Hans Henrik Eriksen, Michael Ernst, Ata +Dzhus, John Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen Eglen, Torbjörn +Einarsson, Tsugutomo Enami, David Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick Farnbach, Oscar Figueiredo, Fred Fish, Karl Fogel, -Gary Foster, Romain Francoise, Noah Friedman, Andreas Fuchs, Hallvard +Gary Foster, Romain Francoise, Noah Friedman, Andreas Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.@: Galbraith, Kevin Gallagher, Kevin Gallo, Juan León Lahoz García, Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David Gillespie, Bob Glickstein, Deepak -Goel, Boris Goldowsky, Michelangelo Grigni, Odd Gripenstam, Kai +Goel, Boris Goldowsky, David Goodger, Michelangelo Grigni, Odd Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug -Gwyn, Ken'ichi Handa, Lars Hansen, Chris Hanson, Jesper Harder, +Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris Hanson, Jesper Harder, Alexandru Harsanyi, K.@: Shane Hartman, John Heidemann, Jon K.@: -Hellan, Magnus Henoch, Markus Heritsch, Karl Heuer, Manabu Higashida, +Hellan, Magnus Henoch, Markus Heritsch, Dirk Herrmann, Karl Heuer, Manabu Higashida, Anders Holst, Jeffrey C.@: Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Philip Jackson, Pavel Janik, Paul Jarc, Ulf Jasper, -Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon Josefsson, Arne +Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani, Brewster Kahle, Tokuya Kameshima, Lute -Kamstra, David Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, -Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel -Klí@v{c}, Shuhei Kobayashi, Pavel Kobiakov, Larry K.@: Kolodney, David +Kamstra, Ivan Kanis, David Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, +Taro Kawagishi, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel +Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K.@: Kolodney, David M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer, Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose -Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Lars +Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, -Francis Litterio, Emilio C.@: Lopes, Károly L@H{o}rentey, Dave Love, -Sascha Lüdecke, Eric Ludlam, Alan Mackenzie, Christopher J.@: Madsen, +Francis Litterio, Emilio C.@: Lopes, Károly L@H{o}rentey, Martin Lorentzon, Dave Love, +Sascha Lüdecke, Eric Ludlam, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, Christopher J.@: Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon -Marshall, Bengt Martensson, Charlie Martin, Thomas May, Roland -McGrath, Will Mengarini, David Megginson, Ben A.@: Mesander, Wayne +Marshall, Bengt Martensson, Charlie Martin, Yukihiro Matsumoto, Thomas May, Will Mengarini, David Megginson, Stefan Merten, Ben A.@: Mesander, Wayne Mesard, Brad Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Moellmann, Stefan Monnier, Morioka Tomohiko, Keith Moore, Jan -Moringen, Glenn Morris, Diane Murray, Sen Nagata, Erik Naggum, Thomas +Moringen, Glenn Morris, Diane Murray, Sen Nagata, Gergely Nagy, Erik Naggum, Nobuyoshi Nakada, Thomas Neumann, Thien-Thi Nguyen, Mike Newton, Jurgen Nickelsen, Dan -Nicolaescu, Hrvoje Niksic, Jeff Norden, Andrew Norman, Christian +Nicolaescu, Hrvoje Niksic, Jeff Norden, Andrew Norman, Edward O'Connor, Kentaro Ohkouchi, Christian Ohler, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota, Pieter E.@: J.@: Pareit, Ross Patterson, David Pearson, Jeff Peck, Damon Anton Permezel, Tom Perrine, William M.@: Perry, Per Persson, Jens -Petersen, Daniel Pfeiffer, Richard L.@: Pieri, Fred Pierresteguy, +Petersen, Daniel Pfeiffer, Richard L.@: Pieri, Fred Pierresteguy, François Pinard, Christian Plaunt, David Ponce, Francesco A.@: Potorti, Michael D.@: Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin Ram, Eric S.@: Raymond, Paul Reilly, Edward M.@: Reingold, Alex Rezinsky, Rob Riepel, David Reitter, Adrian Robert, Nick Roberts, Roland B.@: Roberts, John Robinson, Danny Roozendaal, Sebastian Rose, William -Rosenblatt, Guillermo J.@: Rozas, Martin Rudalics, Ivar Rummelhoff, +Rosenblatt, Markus Rost, Guillermo J.@: Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang Rupprecht, Kevin Ryde, James B.@: Salem, -Masahiko Sato, Jorgen Schaefer, Holger Schauer, William Schelter, +Masahiko Sato, Timo Savola, Jorgen Schaefer, Holger Schauer, William Schelter, Ralph Schleicher, Gregor Schmid, Michael Schmidt, Ronald S.@: Schnell, -Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stephen Schoef, +Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Rainer Schoepf, Stefan Schoef, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham, Stanislav -Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Espen Skoglund, -Rick Sladkey, Lynn Slater, Chris Smith, David Smith, Paul D.@: Smith, +Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor @v{S}imko, Espen Skoglund, +Rick Sladkey, Lynn Slater, Chris Smith, David Smith, Paul D.@: Smith, Wilson Snyder, William Sommerfeld, Andre Spiegel, Michael Staats, Ulf Stegemann, Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.@: Storm, Steve Strassmann, Olaf Sylvester, Naoto Takahashi, Steven Tamm, -Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas, -Jim Thompson, Luc Teirlinck, David O'Toole, Tom Tromey, Enami +Luc Teirlinck, Jean-Philippe Theberge, Jens T.@: Berger Thielemann, Spencer Thomas, +Jim Thompson, Toru Tomabechi, David O'Toole, Markus Triska, Tom Tromey, Enami Tsugutomo, Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil W.@: Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey Voelker, Johan Vromans, Inge Wallin, John Paul -Wallington, Colin Walters, Barry Warsaw, Morten Welinder, Joseph Brian -Wells, Rodney Whitby, John Wiegley, Ed Wilkinson, Mike Williams, Bill +Wallington, Colin Walters, Barry Warsaw, Christoph Wedler, Morten Welinder, Joseph Brian +Wells, Rodney Whitby, John Wiegley, Ed Wilkinson, Mike Williams, Roland Winkler, Bill Wohler, Steven A.@: Wood, Dale R.@: Worley, Francis J.@: Wright, Felix S.@: T.@: Wu, Tom Wurgler, Katsumi Yamaoka, Yamamoto Mitsuharu, Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan -Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Shenghuo Zhu, +Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin, Shenghuo Zhu, Piotr Zielinski, Ian T.@: Zimmermann, Reto Zimmermann, Neal Ziring, Teodor Zlatanov, and Detlev Zundel. @end iftex ------------------------------------------------------------ revno: 107339 author: Vida Gabor committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2012-02-19 23:55:16 +0000 message: gnus-demon.el (gnus-demon-init): Don't multiply time twice. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-02-18 22:28:00 +0000 +++ lisp/gnus/ChangeLog 2012-02-19 23:55:16 +0000 @@ -1,3 +1,8 @@ +2012-02-19 Vida Gábor (tiny change) + + * gnus-demon.el (gnus-demon-init): Don't multiply time twice. + Reported by Peter Münster. + 2012-02-18 Lars Ingebrigtsen * shr.el (shr-image-fetched): Make sure we really kill the right === modified file 'lisp/gnus/gnus-demon.el' --- lisp/gnus/gnus-demon.el 2012-01-28 02:25:57 +0000 +++ lisp/gnus/gnus-demon.el 2012-02-19 23:55:16 +0000 @@ -137,8 +137,7 @@ ;; (func nil number) ;; Only call when Emacs has been idle for `idle' ((and (null time) (numberp idle)) - (run-with-idle-timer (* idle gnus-demon-timestep) t - 'gnus-demon-run-callback func)) + (run-with-idle-timer idle t 'gnus-demon-run-callback func)) ;; (func number any) ;; Call every `time' ((eq time-type 'integer) ------------------------------------------------------------ revno: 107338 fixes bug(s): http://debbugs.gnu.org/10835 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-02-19 21:59:42 +0800 message: Use text properties for color escape highlighting in Shell mode. * ansi-color.el: Don't set comint-output-filter-functions; it is now in the initial value defined in comint.el. (ansi-color-apply-face-function): New variable. (ansi-color-apply-on-region): Use it. (ansi-color-apply-overlay-face): New function. * comint.el: Require ansi-color. (comint-output-filter-functions): Add ansi-color-process-output. * shell.el (shell): No need to require ansi-color. (shell-mode): Use ansi-color-apply-face-function to highlight color escapes using font-lock-face property. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-19 08:14:30 +0000 +++ lisp/ChangeLog 2012-02-19 13:59:42 +0000 @@ -1,5 +1,20 @@ 2012-02-19 Chong Yidong + * comint.el: Require ansi-color. + (comint-output-filter-functions): Add ansi-color-process-output. + + * ansi-color.el: Don't set comint-output-filter-functions; it is + now in the initial value defined in comint.el. + (ansi-color-apply-face-function): New variable. + (ansi-color-apply-on-region): Use it. + (ansi-color-apply-overlay-face): New function. + + * shell.el (shell): No need to require ansi-color. + (shell-mode): Use ansi-color-apply-face-function to highlight + color escapes using font-lock-face property (Bug#10835). + +2012-02-19 Chong Yidong + * vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list mode-line formats (Bug#10839). === modified file 'lisp/ansi-color.el' --- lisp/ansi-color.el 2012-01-19 07:21:25 +0000 +++ lisp/ansi-color.el 2012-02-19 13:59:42 +0000 @@ -183,6 +183,11 @@ :group 'ansi-colors :version "23.2") +(defvar ansi-color-apply-face-function 'ansi-color-apply-overlay-face + "Function for applying an Ansi Color face to text in a buffer. +This function should accept three arguments: BEG, END, and FACE, +and it should apply face FACE to the text between BEG and END.") + ;;;###autoload (defun ansi-color-for-comint-mode-on () "Set `ansi-color-for-comint-mode' to t." @@ -221,9 +226,6 @@ (t (ansi-color-apply-on-region start-marker end-marker))))) -(add-hook 'comint-output-filter-functions - 'ansi-color-process-output) - (defalias 'ansi-color-unfontify-region 'font-lock-default-unfontify-region) (make-obsolete 'ansi-color-unfontify-region "not needed any more" "24.1") @@ -379,10 +381,9 @@ ;; Find the next SGR sequence. (while (re-search-forward ansi-color-regexp end-marker t) ;; Colorize the old block from start to end using old face. - (when face - (ansi-color-set-extent-face - (ansi-color-make-extent start-marker (match-beginning 0)) - face)) + (funcall ansi-color-apply-face-function + start-marker (match-beginning 0) + face) ;; store escape sequence and new start position (setq escape-sequence (match-string 1) start-marker (copy-marker (match-end 0))) @@ -395,22 +396,23 @@ (if (re-search-forward "\033" end-marker t) (progn ;; if the rest of the region should have a face, put it there - (when face - (ansi-color-set-extent-face - (ansi-color-make-extent start-marker (point)) - face)) + (funcall ansi-color-apply-face-function + start-marker (point) face) ;; save face and point (setq ansi-color-context-region (list face (copy-marker (match-beginning 0))))) ;; if the rest of the region should have a face, put it there - (if face - (progn - (ansi-color-set-extent-face - (ansi-color-make-extent start-marker end-marker) - face) - (setq ansi-color-context-region (list face))) - ;; reset context - (setq ansi-color-context-region nil)))))) + (funcall ansi-color-apply-face-function + start-marker end-marker face) + (setq ansi-color-context-region (if face (list face))))))) + +(defun ansi-color-apply-overlay-face (beg end face) + "Make an overlay from BEG to END, and apply face FACE. +If FACE is nil, do nothing." + (when face + (ansi-color-set-extent-face + (ansi-color-make-extent beg end) + face))) ;; This function helps you look for overlapping overlays. This is ;; useful in comint-buffers. Overlapping overlays should not happen! === modified file 'lisp/comint.el' --- lisp/comint.el 2012-02-06 13:56:40 +0000 +++ lisp/comint.el 2012-02-19 13:59:42 +0000 @@ -103,6 +103,7 @@ (eval-when-compile (require 'cl)) (require 'ring) +(require 'ansi-color) ;; Buffer Local Variables: ;;============================================================================ @@ -385,7 +386,7 @@ These functions get one argument, a string containing the text to send.") ;;;###autoload -(defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) +(defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "Functions to call after output is inserted into the buffer. One possible function is `comint-postoutput-scroll-to-bottom'. These functions get one argument, a string containing the text as originally === modified file 'lisp/shell.el' --- lisp/shell.el 2012-02-15 08:00:23 +0000 +++ lisp/shell.el 2012-02-19 13:59:42 +0000 @@ -510,6 +510,16 @@ (set (make-local-variable 'shell-dirstack) nil) (set (make-local-variable 'shell-last-dir) nil) (shell-dirtrack-mode 1) + + ;; By default, ansi-color applies faces using overlays. This is + ;; very inefficient in Shell buffers (e.g. Bug#10835). We use a + ;; custom `ansi-color-apply-face-function' to convert color escape + ;; sequences into `font-lock-face' properties. + (set (make-local-variable 'ansi-color-apply-face-function) + (lambda (beg end face) + (when face + (put-text-property beg end 'font-lock-face face)))) + ;; This is not really correct, since the shell buffer does not really ;; edit this directory. But it is useful in the buffer list and menus. (setq list-buffers-directory (expand-file-name default-directory)) @@ -625,7 +635,6 @@ (read-directory-name "Default directory: " default-directory default-directory t nil)))))))) - (require 'ansi-color) (setq buffer (if (or buffer (not (derived-mode-p 'shell-mode)) (comint-check-proc (current-buffer))) (get-buffer-create (or buffer "*shell*")) ------------------------------------------------------------ revno: 107337 fixes bug(s): http://debbugs.gnu.org/10845 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-02-19 17:58:23 +0800 message: Protect fileio.c primitives against invalid file handler return values. * src/fileio.c (Ffile_name_directory, Ffile_name_nondirectory) (Funhandled_file_name_directory, Ffile_name_as_directory) (Fdirectory_file_name, Fexpand_file_name) (Fsubstitute_in_file_name): Protect against invalid file handler return values. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-02-18 16:54:12 +0000 +++ src/ChangeLog 2012-02-19 09:58:23 +0000 @@ -1,3 +1,11 @@ +2012-02-19 Chong Yidong + + * fileio.c (Ffile_name_directory, Ffile_name_nondirectory) + (Funhandled_file_name_directory, Ffile_name_as_directory) + (Fdirectory_file_name, Fexpand_file_name) + (Fsubstitute_in_file_name): Protect against invalid file handler + return values (Bug#10845). + 2012-02-18 Eli Zaretskii * .gdbinit (pitx): Fix incorrect references to fields of the === modified file 'src/fileio.c' --- src/fileio.c 2012-01-19 07:21:25 +0000 +++ src/fileio.c 2012-02-19 09:58:23 +0000 @@ -328,7 +328,11 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (filename, Qfile_name_directory); if (!NILP (handler)) - return call2 (handler, Qfile_name_directory, filename); + { + Lisp_Object handled_name = call2 (handler, Qfile_name_directory, + filename); + return STRINGP (handled_name) ? handled_name : Qnil; + } filename = FILE_SYSTEM_CASE (filename); #ifdef DOS_NT @@ -397,7 +401,13 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (filename, Qfile_name_nondirectory); if (!NILP (handler)) - return call2 (handler, Qfile_name_nondirectory, filename); + { + Lisp_Object handled_name = call2 (handler, Qfile_name_nondirectory, + filename); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } beg = SSDATA (filename); end = p = beg + SBYTES (filename); @@ -434,7 +444,11 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (filename, Qunhandled_file_name_directory); if (!NILP (handler)) - return call2 (handler, Qunhandled_file_name_directory, filename); + { + Lisp_Object handled_name = call2 (handler, Qunhandled_file_name_directory, + filename); + return STRINGP (handled_name) ? handled_name : Qnil; + } return Ffile_name_directory (filename); } @@ -488,7 +502,13 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (file, Qfile_name_as_directory); if (!NILP (handler)) - return call2 (handler, Qfile_name_as_directory, file); + { + Lisp_Object handled_name = call2 (handler, Qfile_name_as_directory, + file); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } buf = (char *) alloca (SBYTES (file) + 10); file_name_as_directory (buf, SSDATA (file)); @@ -547,7 +567,13 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (directory, Qdirectory_file_name); if (!NILP (handler)) - return call2 (handler, Qdirectory_file_name, directory); + { + Lisp_Object handled_name = call2 (handler, Qdirectory_file_name, + directory); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } buf = (char *) alloca (SBYTES (directory) + 20); directory_file_name (SSDATA (directory), buf); @@ -747,7 +773,7 @@ int is_escaped = 0; #endif /* DOS_NT */ ptrdiff_t length; - Lisp_Object handler, result; + Lisp_Object handler, result, handled_name; int multibyte; Lisp_Object hdir; @@ -757,7 +783,14 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (name, Qexpand_file_name); if (!NILP (handler)) - return call3 (handler, Qexpand_file_name, name, default_directory); + { + handled_name = call3 (handler, Qexpand_file_name, + name, default_directory); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } + /* Use the buffer's default-directory if DEFAULT_DIRECTORY is omitted. */ if (NILP (default_directory)) @@ -783,7 +816,13 @@ { handler = Ffind_file_name_handler (default_directory, Qexpand_file_name); if (!NILP (handler)) - return call3 (handler, Qexpand_file_name, name, default_directory); + { + handled_name = call3 (handler, Qexpand_file_name, + name, default_directory); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } } { @@ -1284,7 +1323,13 @@ to be expanded again. */ handler = Ffind_file_name_handler (result, Qexpand_file_name); if (!NILP (handler)) - return call3 (handler, Qexpand_file_name, result, default_directory); + { + handled_name = call3 (handler, Qexpand_file_name, + result, default_directory); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } return result; } @@ -1537,7 +1582,13 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (filename, Qsubstitute_in_file_name); if (!NILP (handler)) - return call2 (handler, Qsubstitute_in_file_name, filename); + { + Lisp_Object handled_name = call2 (handler, Qsubstitute_in_file_name, + filename); + if (STRINGP (handled_name)) + return handled_name; + error ("Invalid handler in `file-name-handler-alist'"); + } /* Always work on a copy of the string, in case GC happens during decode of environment variables, causing the original Lisp_String ------------------------------------------------------------ revno: 107336 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sun 2012-02-19 09:49:09 +0100 message: Make url-queue not kill a random buffer on error * url-queue.el (url-queue-callback-function): Remove the job from the queue so that we don't kill the current buffer, which will then make the callback function kill a random buffer. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-02-14 18:43:21 +0000 +++ lisp/url/ChangeLog 2012-02-19 08:49:09 +0000 @@ -1,3 +1,9 @@ +2012-02-19 Lars Ingebrigtsen + + * url-queue.el (url-queue-callback-function): Remove the job from + the queue so that we don't kill the current buffer, which will + then make the callback function kill a random buffer. + 2012-02-14 Lars Ingebrigtsen * url-queue.el (url-queue-kill-job): Refactored out code. === modified file 'lisp/url/url-queue.el' --- lisp/url/url-queue.el 2012-02-14 18:43:21 +0000 +++ lisp/url/url-queue.el 2012-02-19 08:49:09 +0000 @@ -108,6 +108,7 @@ (url-queue-start-retrieve waiting)))) (defun url-queue-callback-function (status job) + (setq url-queue (delq job url-queue)) (when (and (eq (car status) :error) (eq (cadr (cadr status)) 'connection-failed)) ;; If we get a connection error, then flush all other jobs from @@ -116,7 +117,6 @@ ;; synchronously and totally halts Emacs. (url-queue-remove-jobs-from-host (plist-get (nthcdr 3 (cadr status)) :host))) - (setq url-queue (delq job url-queue)) (url-queue-run-queue) (apply (url-queue-callback job) (cons status (url-queue-cbargs job)))) ------------------------------------------------------------ revno: 107335 fixes bug(s): http://debbugs.gnu.org/10839 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-02-19 16:14:30 +0800 message: Fix mode-line-format handling bug in Ediff. * lisp/vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list mode-line formats. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-02-18 21:57:00 +0000 +++ lisp/ChangeLog 2012-02-19 08:14:30 +0000 @@ -1,3 +1,8 @@ +2012-02-19 Chong Yidong + + * vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list + mode-line formats (Bug#10839). + 2012-02-18 Glenn Morris * mail/rmail.el (rmail-dont-reply-to-names): Mark as obsolete. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2012-02-18 21:57:00 +0000 +++ lisp/mail/rmail.el 2012-02-19 08:14:30 +0000 @@ -4700,7 +4700,7 @@ ;;;*** ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) -;;;;;; "undigest" "undigest.el" "1be42b2d20b13004f0ad1b504630ed00") +;;;;;; "undigest" "undigest.el" "a31a35802a2adbc51be42959c3043dbd") ;;; Generated autoloads from undigest.el (autoload 'undigestify-rmail-message "undigest" "\ @@ -4711,8 +4711,9 @@ (autoload 'unforward-rmail-message "undigest" "\ Extract a forwarded message from the containing message. -This puts the forwarded message into a separate rmail message -following the containing message. +This puts the forwarded message into a separate rmail message following +the containing message. This command is only useful when messages are +forwarded with `rmail-enable-mime-composing' set to nil. \(fn)" t nil) === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2012-01-19 07:21:25 +0000 +++ lisp/vc/ediff-init.el 2012-02-19 08:14:30 +0000 @@ -1743,8 +1743,10 @@ ;; If ediff modified mode line, strip the modification (defsubst ediff-strip-mode-line-format () - (if (member (car mode-line-format) '(" A: " " B: " " C: " " Ancestor: ")) - (setq mode-line-format (nth 2 mode-line-format)))) + (and (consp mode-line-format) + (member (car mode-line-format) + '(" A: " " B: " " C: " " Ancestor: ")) + (setq mode-line-format (nth 2 mode-line-format)))) ;; Verify that we have a difference selected. (defsubst ediff-valid-difference-p (&optional n) ------------------------------------------------------------ revno: 107334 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-02-19 14:20:23 +0800 message: Fix typo. diff: === modified file 'doc/lispref/help.texi' --- doc/lispref/help.texi 2012-02-19 05:54:33 +0000 +++ doc/lispref/help.texi 2012-02-19 06:20:23 +0000 @@ -526,7 +526,7 @@ The function returns a list of elements that look like this: @example -(@var{symbol} @var{score} @var{functionn-doc} @var{variable-doc} +(@var{symbol} @var{score} @var{function-doc} @var{variable-doc} @var{plist-doc} @var{widget-doc} @var{face-doc} @var{group-doc}) @end example