Mercurial > emacs
changeset 108439:c3622fa53abe
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 26 Mar 2010 15:03:20 +0000 |
| parents | 2485b1fb98d3 (current diff) 805495d3c451 (diff) |
| children | e79d23254789 |
| files | etc/NEWS.23 |
| diffstat | 106 files changed, 2721 insertions(+), 1227 deletions(-) [+] |
line wrap: on
line diff
--- a/.bzrignore Mon Mar 22 10:47:09 2010 +0000 +++ b/.bzrignore Fri Mar 26 15:03:20 2010 +0000 @@ -63,3 +63,5 @@ src/temacs src/deps configure.lineno +conftest* +confdefs.h
--- a/admin/notes/bugtracker Mon Mar 22 10:47:09 2010 +0000 +++ b/admin/notes/bugtracker Fri Mar 26 15:03:20 2010 +0000 @@ -140,7 +140,7 @@ ** Not interested in tracker control messages (tags being set, etc)? Discard mails matching: -^X-Emacs-PR-Message: (transcript|closed) +^X-GNU-PR-Message: (transcript|closed) ** How to avoid multiple copies of mails. If you reply to reports in the normal way, this should work fine. @@ -166,18 +166,18 @@ 2) Send a mail to the original submitter telling them that their bug has been closed. This mail has a header: -X-Emacs-PR-Message: they-closed 123 +X-GNU-PR-Message: they-closed 123 3) Send a mail to you and to the emacs-bug-tracker list confirming that the bug has been closed. This mail has a header: -X-Emacs-PR-Message: closed 123 +X-GNU-PR-Message: closed 123 4) Send a copy of your mail to the bug-gnu-emacs list in exactly the same way as if you had sent mail to "123" (sans -done). This mail has headers: -X-Emacs-PR-Message: cc-closed 123 +X-GNU-PR-Message: cc-closed 123 Mail-Followup-To: 123@debbugs.gnu.org, person-who-closed (This is Emacs-specific. Normally the bug list gets the same mail as in 3).
--- a/admin/notes/copyright Mon Mar 22 10:47:09 2010 +0000 +++ b/admin/notes/copyright Fri Mar 26 15:03:20 2010 +0000 @@ -221,6 +221,11 @@ lib-src/getopt1.c, getopt_int.h - these are from the GNU C library. Leave the copyrights alone. +lisp/cedet/semantic/imenu.el + - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html + in which Eric Ludlam established that the remaining contributions + from authors other than himself were negligible. + lisp/play/tetris.el - no special rules about the copyright. We note here that we believe (2007/1) there is no problem with our use of the name "tetris" or
--- a/doc/emacs/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,35 @@ +2010-03-24 Glenn Morris <rgm@gnu.org> + + * ack.texi (Acknowledgments): + * emacs.texi (Acknowledgments): Fix ispell attribution. (Bug#5759) + +2010-03-20 Jan Djärv <jan.h.d@swipnet.se> + + * xresources.texi (Table of Resources): Clarify toolBar number + for Gtk+. + + * frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736). + +2010-03-21 Chong Yidong <cyd@stupidchicken.com> + + * dired.texi (Dired Updating): Document dired-auto-revert-buffer. + + * search.texi (Other Repeating Search): Document multi-isearch-buffers + and multi-isearch-buffers-regexp. + + * indent.texi (Indentation): Clarify description of + indent-for-tab-command. Document tab-always-indent. + +2010-03-20 Chong Yidong <cyd@stupidchicken.com> + + * cmdargs.texi (Font X): Move most content to Fonts. + + * frames.texi (Fonts): New node. Document font-use-system-font. + + * emacs.texi (Top): + * xresources.texi (Table of Resources): + * mule.texi (Defining Fontsets, Charsets): Update xrefs. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.
--- a/doc/emacs/ack.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/ack.texi Fri Mar 26 15:03:20 2010 +0000 @@ -1,6 +1,7 @@ @c This is part of the Emacs manual. @c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010 +@c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @node Acknowledgments, Screen, Concept Index, Top @@ -600,8 +601,7 @@ program. @item -Geoff Kuenning and Ken Stevens wrote @file{ispell.el}, a spell-checker -interface. +Ken Stevens wrote @file{ispell.el}, a spell-checker interface. @item David K@ringaccent{a}gedal wrote @file{tempo.el}, providing support for
--- a/doc/emacs/cmdargs.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/cmdargs.texi Fri Mar 26 15:03:20 2010 +0000 @@ -755,10 +755,9 @@ @appendixsec Font Specification Options @cindex font name (X Window System) - By default, Emacs displays text in X using a twelve point monospace -font. You can specify a different font using the command line option -@samp{-fn @var{font}} (or @samp{--font}, which is an alias for -@samp{-fn}). +You can use the command line option @samp{-fn @var{font}} (or +@samp{--font}, which is an alias for @samp{-fn}) to specify a default +font: @table @samp @item -fn @var{font} @@ -772,252 +771,14 @@ When passing a font specification to Emacs on the command line, you may need to ``quote'' it, by enclosing it in quotation marks, if it contains characters that the shell treats specially (e.g. spaces). -Here is an example: +For example: @smallexample emacs -fn "DejaVu Sans Mono-12" @end smallexample -@cindex X defaults file -@cindex X resources file - You can also specify the font using your X resources file (usually a -file named @file{.Xdefaults} or @file{.Xresources} in your home -directory), by adding a line like this: - -@smallexample -emacs.font: @var{font} -@end smallexample - -@noindent -You must restart X, or use the @command{xrdb} command, for the X -resources file to take effect. @xref{Resources}. When specifying a -font in your X resources file, you should not quote it. - -@cindex fontconfig - Emacs recognizes two types of fonts: @dfn{client-side} fonts, which -are provided by the Xft and Fontconfig libraries, and -@dfn{server-side} fonts, which are provided by the X server itself. -Most client-side fonts support advanced font features such as -antialiasing and subpixel hinting, while server-side fonts do not. - - There are four different ways to express a ``font name''. The first -format consists of @dfn{Fontconfig patterns}. Fontconfig patterns -match only client-side fonts provided by Xft and Fontconfig, and have -the following form: - -@smallexample -@var{fontname}[-@var{fontsize}][:@var{name1}=@var{values1}][:@var{name2}=@var{values2}]... -@end smallexample - -@noindent -Within this format, any of the elements in braces may be omitted. -Here, @var{fontname} is the ``family name'' of the font, such as -@samp{Monospace} or @samp{DejaVu Serif}; @var{fontsize} is the ``point -size'' of the font (one ``printer's point'' is about 1/72 of an inch); -and the @samp{@var{name}=@var{values}} entries specify settings such -as the slant and weight of the font. Each @var{values} may be a -single value, or a list of values separated by commas. In addition, -some property values are valid with only one kind of property name, in -which case the @samp{@var{name}=} part may be omitted. - -Here is a list of common font properties: - -@table @samp -@item slant -One of @samp{italic}, @samp{oblique} or @samp{roman}. - -@item weight -One of @samp{light}, @samp{medium}, @samp{demibold}, @samp{bold} or -@samp{black}. - -@item style -Some fonts define special styles which are a combination of slant and -weight. For instance, the font @samp{Dejavu Sans} defines the style -@samp{book}. This property, if specified, overrides the slant and -weight properties. - -@item width -One of @samp{condensed}, @samp{normal}, or @samp{expanded}. - -@item spacing -One of @samp{monospace}, @samp{proportional}, @samp{dual-width}, or -@samp{charcell}. -@end table - -@noindent -Here are some examples of Fontconfig patterns: - -@smallexample -Monospace -Monospace-12 -Monospace-12:bold -DejaVu Sans Mono:bold:italic -Monospace-12:weight=bold:slant=italic -@end smallexample - -See the Fontconfig manual for a more detailed description of -Fontconfig patterns. This manual is located in the file -@file{fontconfig-user.html}, which is distributed with Fontconfig. It -is also available online at -@url{http://fontconfig.org/fontconfig-user.html}. In particular, the -manual describes additional font properties that influence how the -font is hinted, antialiased, or scaled. - - The second way to specify a font is to use a @dfn{GTK font -description}. Like Fontconfig patterns, GTK font descriptions match -only client-side fonts provided by Xft and Fontconfig. They have the -syntax - -@smallexample -@var{fontname} [@var{properties}] [@var{fontsize}] -@end smallexample - -@noindent -where @var{fontname} is the family name, @var{properties} is a list of -property values separated by spaces, and @var{fontsize} is the point -size. The properties that you may specify are as follows: - -@table @samp -@item style -One of @samp{roman}, @samp{italic} or @samp{oblique}. If omitted, the -@samp{roman} style is used. -@item weight -One of @samp{medium}, @samp{ultra-light}, @samp{light}, -@samp{semi-bold}, or @samp{bold}. If omitted, @samp{medium} weight is -used. -@end table - -@noindent -Here are some examples of GTK font descriptions: - -@smallexample -Monospace 12 -Monospace Bold Italic 12 -@end smallexample - -@cindex XLFD -@cindex X Logical Font Description - The third way to specify a font is to use an @dfn{XLFD} (@dfn{X -Logical Font Description}), which is the traditional method for -specifying fonts under X. Each XLFD consists of fourteen words or -numbers, separated by dashes, like this: - -@smallexample --misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 -@end smallexample - -@noindent -A wildcard character (@samp{*}) in an XLFD matches any sequence of -characters (including none), and @samp{?} matches any single -character. However, matching is implementation-dependent, and can be -inaccurate when wildcards match dashes in a long name. For reliable -results, supply all 14 dashes and use wildcards only within a field. -Case is insignificant in an XLFD. The syntax for an XLFD is as -follows: - -@smallexample --@var{maker}-@var{family}-@var{weight}-@var{slant}-@var{widthtype}-@var{style}@dots{} -@dots{}-@var{pixels}-@var{height}-@var{horiz}-@var{vert}-@var{spacing}-@var{width}-@var{registry}-@var{encoding} -@end smallexample - -@noindent -The entries have the following meanings: - -@table @var -@item maker -The name of the font manufacturer. -@item family -The name of the font family (e.g. @samp{courier}). -@item weight -The font weight---normally either @samp{bold}, @samp{medium} or -@samp{light}. Some font names support other values. -@item slant -The font slant---normally @samp{r} (roman), @samp{i} (italic), -@samp{o} (oblique), @samp{ri} (reverse italic), or @samp{ot} (other). -Some font names support other values. -@item widthtype -The font width---normally @samp{condensed}, @samp{extended}, -@samp{semicondensed} or @samp{normal} (some font names support other -values). -@item style -An optional additional style name. Usually it is empty---most long -font names have two hyphens in a row at this point. -@item pixels -The font height, in pixels. -@item height -The font height on the screen, measured in tenths of a printer's -point. This is the point size of the font, times ten. For a given -vertical resolution, @var{height} and @var{pixels} are proportional; -therefore, it is common to specify just one of them and use @samp{*} -for the other. -@item horiz -The horizontal resolution, in pixels per inch, of the screen for which -the font is intended. -@item vert -The vertical resolution, in pixels per inch, of the screen for which -the font is intended. Normally the resolution of the fonts on your -system is the right value for your screen; therefore, you normally -specify @samp{*} for this and @var{horiz}. -@item spacing -This is @samp{m} (monospace), @samp{p} (proportional) or @samp{c} -(character cell). -@item width -The average character width, in pixels, multiplied by ten. -@item registry -@itemx encoding -The X font character set that the font depicts. (X font character -sets are not the same as Emacs character sets, but they are similar.) -You can use the @command{xfontsel} program to check which choices you -have. Normally you should use @samp{iso8859} for @var{registry} and -@samp{1} for @var{encoding}. -@end table - - Some fonts have shorter nicknames, which you can use instead of a -normal font specification. For instance, - -@smallexample --misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 -@end smallexample - -@noindent -is equivalent to @samp{6x13}. This is the fourth and final method of -specifying a font. - -@cindex listing system fonts - You will probably want to use a fixed-width default font---that is, -a font in which all characters have the same width. Here's how to use -the @command{fc-list} command to list all fixed-width Xft and -Fontconfig fonts available on your system: - -@example -fc-list :spacing=mono -fc-list :spacing=charcell -@end example - - For server-side X fonts, any font with @samp{m} or @samp{c} in the -@var{spacing} field of the XLFD is a fixed-width font. Here's how to -use the @command{xlsfonts} program to list all the fixed-width fonts -available on your system: - -@example -xlsfonts -fn '*x*' | egrep "^[0-9]+x[0-9]+" -xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-m*' -xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-c*' -@end example - -@noindent -To see what a particular font looks like, use the @command{xfd} command. -For example: - -@example -xfd -fn 6x13 -@end example - -@noindent -displays the entire font @samp{6x13}. - - While running Emacs, you can set the font of a specific kind of text -(@pxref{Faces}), or of a particular frame (@pxref{Frame Parameters}). +@xref{Fonts}, for other ways to specify the default font and font name +formats. @node Colors @appendixsec Window Color Options
--- a/doc/emacs/dired.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/dired.texi Fri Mar 26 15:03:20 2010 +0000 @@ -1099,6 +1099,15 @@ If you use @kbd{l} on a subdirectory header line, it updates the contents of the corresponding subdirectory. +@vindex dired-auto-revert-buffer + If you use @kbd{C-x d} or some other Dired command to visit a +directory that is already being shown in a Dired buffer, Dired +switches to that buffer but does not update it. If the buffer is not +up-to-date, Dired displays a warning telling you to type @key{g} to +update it. You can also tell Emacs to revert each Dired buffer +automatically when you revisit it, by setting the variable +@code{dired-auto-revert-buffer} to a non-@code{nil} value. + @kindex k @r{(Dired)} @findex dired-do-kill-lines To delete the specified @emph{file lines} from the buffer---not
--- a/doc/emacs/emacs.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/emacs.texi Fri Mar 26 15:03:20 2010 +0000 @@ -12,8 +12,8 @@ updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -Free Software Foundation, Inc. +1998, 1999, 2000, 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 @@ -502,6 +502,7 @@ * Mode Line Mouse:: Mouse clicks on the mode line. * Creating Frames:: Creating additional Emacs frames with various contents. * Frame Commands:: Iconifying, deleting, and switching frames. +* Fonts:: Changing the frame font. * Speedbar:: How to make and use a speedbar frame. * Multiple Displays:: How one Emacs job can talk to several displays. * Special Buffer Frames:: You can make certain buffers have their own frames. @@ -1371,8 +1372,8 @@ Henry Kautz, Taichi Kawabata, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Shuhei Kobayashi, Pavel Kobiakov, Larry K.@: Kolodney, David M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian -Kremer, Ryszard Kubiak, Geoff Kuenning, David K@aa{}gedal, Daniel -LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, +Kremer, Ryszard Kubiak, David K@aa{}gedal, Daniel LaLiberte, +Karl Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, Francis Litterio, Emilio C. Lopes, K@'{a}roly L@H{o}rentey,
--- a/doc/emacs/frames.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/frames.texi Fri Mar 26 15:03:20 2010 +0000 @@ -39,6 +39,7 @@ * Mode Line Mouse:: Mouse clicks on the mode line. * Creating Frames:: Creating additional Emacs frames with various contents. * Frame Commands:: Iconifying, deleting, and switching frames. +* Fonts:: Changing the frame font. * Speedbar:: How to make and use a speedbar frame. * Multiple Displays:: How one Emacs job can talk to several displays. * Special Buffer Frames:: You can make certain buffers have their own frames. @@ -571,25 +572,19 @@ Lisp Reference Manual}, for more information. @cindex font (default) - For instance, one way to specify the principal font for all your -Emacs frames is to modify @code{default-frame-alist} to specify the -@code{font} parameter (@pxref{Font X}): + Here is an example of using @code{default-frame-alist} to specify +the default foreground color and font: @example (add-to-list 'default-frame-alist '(font . "10x20")) -@end example - -@noindent -Here's a similar example for specifying a foreground color: - -@example (add-to-list 'default-frame-alist '(foreground-color . "blue")) @end example @noindent By putting such customizations in your init file, you can control the -appearance of all the frames Emacs creates, including the initial one. -@xref{Init File}. +appearance of all the frames Emacs creates, including the initial one +(@pxref{Init File}). @xref{Fonts}, for other ways to set the default +font. @node Frame Commands @section Frame Commands @@ -645,6 +640,278 @@ a frame that raises, so this variable has no effect in the native MS-Windows build of Emacs. +@node Fonts +@section Fonts +@cindex fonts + + By default, Emacs displays text in X using a 12-point monospace +font. There are several different ways to specify a different font: + +@itemize +@item +Click on @samp{Set Default Font} in the @samp{Options} menu. To save +this for future sessions, click on @samp{Save Options} in the +@samp{Options} menu. + +@item +Add a line to your init file (@pxref{Init File}), modifying the +variable @code{default-frame-alist} to specify the @code{font} +parameter (@pxref{Creating Frames}), like this: + +@smallexample +(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-12")) +@end smallexample + +@cindex X defaults file +@cindex X resources file +@item +Add an @samp{emacs.font} X resource setting to your X resource file, +like this: + +@smallexample +emacs.font: DejaVu Sans Mono-12 +@end smallexample + +@noindent +You must restart X, or use the @command{xrdb} command, for the X +resources file to take effect. @xref{Resources}. When specifying a +font in your X resources file, you should not quote it. + +@item +If you are running Emacs on the GNOME desktop, you can tell Emacs to +use the default system font by setting the variable +@code{font-use-system-font} to @code{t} (the default is @code{nil}). +For this to work, Emacs must be compiled with Gconf support; this is +done automatically if the libraries are present at compile time. + +@item +Use the command line option @samp{-fn} (or @samp{--font}). @xref{Font +X}. +@end itemize + +@cindex fontconfig + On X, there are four different ways to express a ``font name''. The +first is to use a @dfn{Fontconfig pattern}. Fontconfig patterns have +the following form: + +@smallexample +@var{fontname}[-@var{fontsize}][:@var{name1}=@var{values1}][:@var{name2}=@var{values2}]... +@end smallexample + +@noindent +Within this format, any of the elements in braces may be omitted. +Here, @var{fontname} is the @dfn{family name} of the font, such as +@samp{Monospace} or @samp{DejaVu Serif}; @var{fontsize} is the +@dfn{point size} of the font (one @dfn{printer's point} is about 1/72 +of an inch); and the @samp{@var{name}=@var{values}} entries specify +settings such as the slant and weight of the font. Each @var{values} +may be a single value, or a list of values separated by commas. In +addition, some property values are valid with only one kind of +property name, in which case the @samp{@var{name}=} part may be +omitted. + +Here is a list of common font properties: + +@table @samp +@item slant +One of @samp{italic}, @samp{oblique} or @samp{roman}. + +@item weight +One of @samp{light}, @samp{medium}, @samp{demibold}, @samp{bold} or +@samp{black}. + +@item style +Some fonts define special styles which are a combination of slant and +weight. For instance, @samp{Dejavu Sans} defines the @samp{book} +style, which overrides the slant and weight properties. + +@item width +One of @samp{condensed}, @samp{normal}, or @samp{expanded}. + +@item spacing +One of @samp{monospace}, @samp{proportional}, @samp{dual-width}, or +@samp{charcell}. +@end table + +@noindent +Here are some examples of Fontconfig patterns: + +@smallexample +Monospace +Monospace-12 +Monospace-12:bold +DejaVu Sans Mono:bold:italic +Monospace-12:weight=bold:slant=italic +@end smallexample + +See the Fontconfig manual for a more detailed description of +Fontconfig patterns. This manual is located in the file +@file{fontconfig-user.html}, distributed with Fontconfig. It is also +available online at @url{http://fontconfig.org/fontconfig-user.html}. +In particular, that manual describes additional font properties that +influence how the font is hinted, antialiased, or scaled. + + The second way to specify a font is to use a @dfn{GTK font +description}. These have the syntax + +@smallexample +@var{fontname} [@var{properties}] [@var{fontsize}] +@end smallexample + +@noindent +where @var{fontname} is the family name, @var{properties} is a list of +property values separated by spaces, and @var{fontsize} is the point +size. The properties that you may specify are as follows: + +@table @samp +@item style +One of @samp{roman}, @samp{italic} or @samp{oblique}. If omitted, the +@samp{roman} style is used. +@item weight +One of @samp{medium}, @samp{ultra-light}, @samp{light}, +@samp{semi-bold}, or @samp{bold}. If omitted, @samp{medium} weight is +used. +@end table + +@noindent +Here are some examples of GTK font descriptions: + +@smallexample +Monospace 12 +Monospace Bold Italic 12 +@end smallexample + +@cindex XLFD +@cindex X Logical Font Description + The third way to specify a font is to use an @dfn{XLFD} (@dfn{X +Logical Font Description}). This is the traditional method for +specifying fonts under X. Each XLFD consists of fourteen words or +numbers, separated by dashes, like this: + +@smallexample +-misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 +@end smallexample + +@noindent +A wildcard character (@samp{*}) in an XLFD matches any sequence of +characters (including none), and @samp{?} matches any single +character. However, matching is implementation-dependent, and can be +inaccurate when wildcards match dashes in a long name. For reliable +results, supply all 14 dashes and use wildcards only within a field. +Case is insignificant in an XLFD. The syntax for an XLFD is as +follows: + +@smallexample +-@var{maker}-@var{family}-@var{weight}-@var{slant}-@var{widthtype}-@var{style}@dots{} +@dots{}-@var{pixels}-@var{height}-@var{horiz}-@var{vert}-@var{spacing}-@var{width}-@var{registry}-@var{encoding} +@end smallexample + +@noindent +The entries have the following meanings: + +@table @var +@item maker +The name of the font manufacturer. +@item family +The name of the font family (e.g. @samp{courier}). +@item weight +The font weight---normally either @samp{bold}, @samp{medium} or +@samp{light}. Some font names support other values. +@item slant +The font slant---normally @samp{r} (roman), @samp{i} (italic), +@samp{o} (oblique), @samp{ri} (reverse italic), or @samp{ot} (other). +Some font names support other values. +@item widthtype +The font width---normally @samp{condensed}, @samp{extended}, +@samp{semicondensed} or @samp{normal} (some font names support other +values). +@item style +An optional additional style name. Usually it is empty---most long +font names have two hyphens in a row at this point. +@item pixels +The font height, in pixels. +@item height +The font height on the screen, measured in tenths of a printer's +point. This is the point size of the font, times ten. For a given +vertical resolution, @var{height} and @var{pixels} are proportional; +therefore, it is common to specify just one of them and use @samp{*} +for the other. +@item horiz +The horizontal resolution, in pixels per inch, of the screen for which +the font is intended. +@item vert +The vertical resolution, in pixels per inch, of the screen for which +the font is intended. Normally the resolution of the fonts on your +system is the right value for your screen; therefore, you normally +specify @samp{*} for this and @var{horiz}. +@item spacing +This is @samp{m} (monospace), @samp{p} (proportional) or @samp{c} +(character cell). +@item width +The average character width, in pixels, multiplied by ten. +@item registry +@itemx encoding +The X font character set that the font depicts. (X font character +sets are not the same as Emacs character sets, but they are similar.) +You can use the @command{xfontsel} program to check which choices you +have. Normally you should use @samp{iso8859} for @var{registry} and +@samp{1} for @var{encoding}. +@end table + + The fourth and final method of specifying a font is to use a ``font +nickname''. Certain fonts have shorter nicknames, which you can use +instead of a normal font specification. For instance, @samp{6x13} is +equivalent to + +@smallexample +-misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 +@end smallexample + +@cindex client-side fonts +@cindex server-side fonts + On X, Emacs recognizes two types of fonts: @dfn{client-side} fonts, +which are provided by the Xft and Fontconfig libraries, and +@dfn{server-side} fonts, which are provided by the X server itself. +Most client-side fonts support advanced font features such as +antialiasing and subpixel hinting, while server-side fonts do not. +Fontconfig and GTK patterns match only client-side fonts. + +@cindex listing system fonts + You will probably want to use a fixed-width default font---that is, +a font in which all characters have the same width. For Xft and +Fontconfig fonts, you can use the @command{fc-list} command to list +the available fixed-width fonts, like this: + +@example +fc-list :spacing=mono fc-list :spacing=charcell +@end example + +@noindent +For server-side X fonts, you can use the @command{xlsfonts} program to +list the available fixed-width fonts, like this: + +@example +xlsfonts -fn '*x*' | egrep "^[0-9]+x[0-9]+" +xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-m*' +xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-c*' +@end example + +@noindent +Any font with @samp{m} or @samp{c} in the @var{spacing} field of the +XLFD is a fixed-width font. To see what a particular font looks like, +use the @command{xfd} command. For example: + +@example +xfd -fn 6x13 +@end example + +@noindent +displays the entire font @samp{6x13}. + + While running Emacs, you can also set the font of a specific kind of +text (@pxref{Faces}), or a particular frame (@pxref{Frame +Parameters}). + @node Speedbar @section Speedbar Frames @cindex speedbar @@ -957,7 +1224,7 @@ With no argument, this command toggles Menu Bar mode, a minor mode. With an argument, the command turns Menu Bar mode on if the argument is positive, off if the argument is not positive. You can use -the X resource @samp{menuBarLines} to control the initial setting of +the X resource @samp{menuBar} to control the initial setting of Menu Bar mode. @xref{Resources}. @kindex C-Mouse-3 @r{(when menu bar is disabled)}
--- a/doc/emacs/indent.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/indent.texi Fri Mar 26 15:03:20 2010 +0000 @@ -37,34 +37,38 @@ Indent from point to under an indentation point in the previous line. @end table - In most major modes, the @key{TAB} key runs the command -@code{indent-for-tab-command}, which either performs indentation or -inserts whitespace at point, depending on the situation. +@noindent +The @key{TAB} key runs @code{indent-for-tab-command} in most major +modes (in C and related modes, @key{TAB} runs a separate command, +@code{c-indent-line-or-region}, which behaves similarly). The major +mode determines just what this entails. - In programming modes such as Lisp mode and C mode, @key{TAB} indents -the current line if the region is inactive. If the region is active, -it indents every line in the region (@pxref{Mark}). Indentation means -adding or removing some combination of space and tab characters -(@dfn{whitespace characters}) at the start of the line, in a way that -makes sense given the text in the preceding lines. Exactly how -indentation is performed depends on the major mode. @xref{Program -Indent}. + In text modes, @key{TAB} inserts some combination of space and tab +characters to advance point to the next tab stop (@pxref{Tab Stops}). +If the region is active and spans multiple lines, it advances the +first character of each of those lines to the next tab stop +(@pxref{Using Region}). For the purposes of this command, the +position of the first non-whitespace character on the preceding line +is treated as an additional tab stop. Thus, you can use @key{TAB} to +``align'' point with the preceding line. - In text modes, @key{TAB} inserts some whitespace characters to -advance point to the next tab stop (@pxref{Tab Stops}). For the -purposes of this command, the position of the first non-whitespace -character on the preceding line is treated as an additional tab stop. -You can therefore use @key{TAB} to ``align'' point with the preceding -line. If the region is active, @key{TAB} performs this action on -every line in the region. + In programming modes, @key{TAB} adds or removes some combination of +space and tab characters at the start of the line, in a way that makes +sense given the text in the preceding lines. If the region is active +and spans multiple lines, all those lines are indented this way. If +point was initially within the current line's indentation, it is +positioned after that indentation; otherwise, it remains at same point +in the newly-indented text. @xref{Program Indent}. @vindex tab-width - Indentation is often performed with the help of @dfn{tab characters} -(@acronym{ASCII} code 9), which are displayed as a stretch of empty space -extending to the next @dfn{display tab stop}. By default, there is -one display tab stop every eight columns; the number of columns is -determined by the variable @code{tab-width}. You can insert a single -tab character by typing @kbd{C-q @key{TAB}}. @xref{Text Display}. + Normally, indentation commands insert (or remove) an optimal mix of +@dfn{tab characters} and spaces to align to the desired column. Tab +characters (@acronym{ASCII} code 9) are displayed as a stretch of +empty space extending to the next @dfn{display tab stop}. By default, +there is one display tab stop every eight columns; the number of +columns is determined by the variable @code{tab-width}. You can +insert a single tab character by typing @kbd{C-q @key{TAB}}. +@xref{Text Display}. @findex edit-tab-stops @findex tab-to-tab-stop @@ -74,11 +78,20 @@ to advance point up to the next tab stop. By default, this involves deleting the existing whitespace and inserting a single tab character. - Normally, most of these indentation commands insert an optimal mix -of tabs and spaces to align to the desired column. @xref{Just -Spaces}, for how to disable use of tabs. However, @kbd{C-q @key{TAB}} -always inserts a tab, even when tabs are disabled for the indentation -commands. + @xref{Just Spaces}, for how to disable use of tabs. However, +@kbd{C-q @key{TAB}} always inserts a tab, even when tabs are disabled +for the indentation commands. + +@vindex tab-always-indent + The variable @code{tab-always-indent} tweaks the behavior of the +@key{TAB} (@code{indent-for-tab-command}) command. The default value, +@code{t}, gives the behavior described above. If you change the value +to the symbol @code{complete}, then @key{TAB} first tries to indent +the current line, and if the line was already indented, it tries to +complete the text at point (@pxref{Symbol Completion}). If the value +is @code{nil}, then @key{TAB} indents the current line only if point +is at the left margin or in the line's indentation; otherwise, it +inserts a real tab character. @menu * Indentation Commands:: Various commands and techniques for indentation.
--- a/doc/emacs/mule.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/mule.texi Fri Mar 26 15:03:20 2010 +0000 @@ -1442,7 +1442,7 @@ fontset is called @code{create-fontset-from-fontset-spec}. You can also call this function explicitly to create a fontset. - @xref{Font X}, for more information about font naming in X. + @xref{Fonts}, for more information about font naming. @node Modifying Fontsets @section Modifying Fontsets @@ -1619,7 +1619,7 @@ that you don't have to worry about them. However, it is sometimes helpful to know some of the underlying details about charsets. - One example is font selection (@pxref{Font X}). Each language + One example is font selection (@pxref{Fonts}). Each language environment (@pxref{Language Environments}) defines a ``priority list'' for the various charsets. When searching for a font, Emacs initially attempts to find one that can display the highest-priority
--- a/doc/emacs/search.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/search.texi Fri Mar 26 15:03:20 2010 +0000 @@ -1294,13 +1294,25 @@ @findex keep-lines @table @kbd -@item M-x occur @key{RET} @var{regexp} @key{RET} -Display a list showing each line in the buffer that contains a match -for @var{regexp}. To limit the search to part of the buffer, narrow -to that part (@pxref{Narrowing}). A numeric argument @var{n} -specifies that @var{n} lines of context are to be displayed before and -after each matching line. Currently, @code{occur} can not correctly -handle multiline matches. +@item M-x multi-isearch-buffers +Prompt for one or more buffer names, ending with @key{RET}; then, +begin a multi-buffer incremental search in those buffers. (If the +search fails in one buffer, the next @kbd{C-s} tries searching the +next specified buffer, and so forth.) With a prefix argument, prompt +for a regexp and begin a multi-buffer incremental search in buffers +matching that regexp. + +@item M-x multi-isearch-buffers-regexp +This command is just like @code{multi-isearch-buffers}, except it +performs an incremental regexp search. + +@item M-x occur +Prompt for a regexp, and display a list showing each line in the +buffer that contains a match for it. To limit the search to part of +the buffer, narrow to that part (@pxref{Narrowing}). A numeric +argument @var{n} specifies that @var{n} lines of context are to be +displayed before and after each matching line. Currently, +@code{occur} can not correctly handle multiline matches. @kindex RET @r{(Occur mode)} @kindex o @r{(Occur mode)} @@ -1325,41 +1337,42 @@ @item M-x list-matching-lines Synonym for @kbd{M-x occur}. -@item M-x multi-occur @key{RET} @var{buffers} @key{RET} @var{regexp} @key{RET} -This function is just like @code{occur}, except it is able to search -through multiple buffers. It asks you to specify the buffer names one by one. +@item M-x multi-occur +This command is just like @code{occur}, except it is able to search +through multiple buffers. It asks you to specify the buffer names one +by one. -@item M-x multi-occur-in-matching-buffers @key{RET} @var{bufregexp} @key{RET} @var{regexp} @key{RET} -This function is similar to @code{multi-occur}, except the buffers to -search are specified by a regular expression that matches visited -file names. With a prefix argument, it uses the regular expression to match -buffer names instead. +@item M-x multi-occur-in-matching-buffers +This command is similar to @code{multi-occur}, except the buffers to +search are specified by a regular expression that matches visited file +names. With a prefix argument, it uses the regular expression to +match buffer names instead. -@item M-x how-many @key{RET} @var{regexp} @key{RET} -Print the number of matches for @var{regexp} that exist in the buffer -after point. If the region is active, this operates on the region -instead. +@item M-x how-many +Prompt for a regexp, and print the number of matches for it in the +buffer after point. If the region is active, this operates on the +region instead. -@item M-x flush-lines @key{RET} @var{regexp} @key{RET} -This command deletes each line that contains a match for @var{regexp}, -operating on the text after point; it deletes the current line if it -contains a match starting after point. If the region is active, it -operates on the region instead; if a line partially contained in the -region contains a match entirely contained in the region, it is -deleted. +@item M-x flush-lines +Prompt for a regexp, and delete each line that contains a match for +it, operating on the text after point. This command deletes the +current line if it contains a match starting after point. If the +region is active, it operates on the region instead; if a line +partially contained in the region contains a match entirely contained +in the region, it is deleted. If a match is split across lines, @code{flush-lines} deletes all those lines. It deletes the lines before starting to look for the next match; hence, it ignores a match starting on the same line at which another match ended. -@item M-x keep-lines @key{RET} @var{regexp} @key{RET} -This command deletes each line that @emph{does not} contain a match -for @var{regexp}, operating on the text after point; if point is not -at the beginning of a line, it always keeps the current line. If the -region is active, the command operates on the region instead; it never -deletes lines that are only partially contained in the region (a -newline that ends a line counts as part of that line). +@item M-x keep-lines +Prompt for a regexp, and delete each line that @emph{does not} contain +a match for it, operating on the text after point. If point is not at +the beginning of a line, this command always keeps the current line. +If the region is active, the command operates on the region instead; +it never deletes lines that are only partially contained in the region +(a newline that ends a line counts as part of that line). If a match is split across lines, this command keeps all those lines. @end table
--- a/doc/emacs/xresources.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/emacs/xresources.texi Fri Mar 26 15:03:20 2010 +0000 @@ -193,7 +193,7 @@ @end ifnottex @item @code{font} (class @code{Font}) -Font name for the @code{default} font. @xref{Font X}. You can also +Font name for the @code{default} font. @xref{Fonts}. You can also specify a fontset name (@pxref{Fontsets}). @item @code{fontBackend} (class @code{FontBackend}) @@ -307,12 +307,14 @@ @item @code{toolBar} (class @code{ToolBar}) @cindex tool bar Number of lines to reserve for the tool bar. A zero value suppresses -the tool bar. If the value is non-zero and -@code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's size -will be changed automatically so that all tool bar items are visible. +the tool bar. For the Emacs tool bar (i.e. not Gtk+), if the value is +non-zero and @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's +size will be changed automatically so that all tool bar items are visible. If the value of @code{auto-resize-tool-bars} is @code{grow-only}, the tool bar expands automatically, but does not contract automatically. To contract the tool bar, you must redraw the frame by entering @kbd{C-l}. +For the Gtk+ tool bar, any non-zero value means on and +@code{auto-resize-tool-bars} has no effect. @item @code{useXIM} (class @code{UseXIM}) @cindex XIM
--- a/doc/lispref/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/lispref/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,11 @@ +2010-03-24 Arni Magnusson <arnima@hafro.is> (tiny change) + + * frames.texi (Cursor Parameters): Fix typo. (Bug#5760) + +2010-03-24 Chong Yidong <cyd@stupidchicken.com> + + * processes.texi (Network Processes): Document seqpacket type. + 2010-03-20 Dan Nicolaescu <dann@ics.uci.edu> * os.texi (System Environment): Do not mention lynxos.
--- a/doc/lispref/frames.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/lispref/frames.texi Fri Mar 26 15:03:20 2010 +0000 @@ -821,7 +821,7 @@ selected. It supports the same values as the @code{cursor-type} frame parameter; also, @code{nil} means don't display a cursor in nonselected windows, and @code{t} (the default) means use a standard -modificatoin of the usual cursor type (solid box becomes hollow box, +modification of the usual cursor type (solid box becomes hollow box, and bar becomes a narrower bar). @end defopt
--- a/doc/lispref/processes.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/lispref/processes.texi Fri Mar 26 15:03:20 2010 +0000 @@ -2059,7 +2059,8 @@ @item :type @var{type} Specify the communication type. A value of @code{nil} specifies a stream connection (the default); @code{datagram} specifies a datagram -connection. Both connections and servers can be of either type. +connection; @code{seqpacket} specifies a ``sequenced packet stream'' +connection. Both connections and servers can be of these types. @item :server @var{server-flag} If @var{server-flag} is non-@code{nil}, create a server. Otherwise,
--- a/doc/misc/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/misc/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,7 @@ +2010-03-24 Michael Albinus <michael.albinus@gmx.de> + + * trampver.texi: Update release number. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.
--- a/doc/misc/trampver.texi Mon Mar 22 10:47:09 2010 +0000 +++ b/doc/misc/trampver.texi Fri Mar 26 15:03:20 2010 +0000 @@ -9,7 +9,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.1.18-pre +@set trampver 2.1.18-23.2 @c Other flags from configuration @set instprefix /usr/local
--- a/etc/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,14 @@ +2010-03-24 Francesc Rocher <rocher@member.fsf.org> + + * MORE.STUFF: Remove CEDET entry, now distributed as part of + Emacs. + +2010-03-22 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus/gnus-setup.ast: Add finish links to the top nodes. + + * gnus/news-server.ast: Add some trivial validation. + 2010-03-13 Michael Albinus <michael.albinus@gmx.de> * NEWS: Add secrets.el.
--- a/etc/MORE.STUFF Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/MORE.STUFF Fri Mar 26 15:03:20 2010 +0000 @@ -130,10 +130,6 @@ * Boxquote: <URL:http://www.davep.org/emacs/> - * CEDET: Collection of Emacs Development Environment Tools, including - EIEIO, Semantic, Speedbar, EDE, and COGRE: - <URL:http://cedet.sourceforge.net/> - * CJK-emacs: Converting MULE-encoded text to TeX: <URL:ftp://ctan.tug.org/tex-archive/language/chinese/CJK/> and mirrors of the `CTAN' TeX archives.
--- a/etc/NEWS Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/NEWS Fri Mar 26 15:03:20 2010 +0000 @@ -45,6 +45,7 @@ * Changes in Specialized Modes and Packages in Emacs 24.1 +** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags. ** Customize *** Customize buffers now contain a search field. @@ -94,6 +95,8 @@ * Lisp changes in Emacs 24.1 +** New completion style `substring'. + ** Image API *** When the image type is one of listed in `image-animated-types'
--- a/etc/NEWS.23 Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/NEWS.23 Fri Mar 26 15:03:20 2010 +0000 @@ -71,14 +71,14 @@ Customize `make-pointer-invisible' to disable this feature. ** Font changes - ++++ *** Emacs can use the system default monospaced font in Gnome. To enable this feature, set `font-use-system-font' to non-nil (it is nil by default). If the system default changes, Emacs changes also. This feature requires Gconf support, which is automatically included at compile-time if configure detects the gconf libraries (you can disable this with the configure option --without-gconf). - +--- *** On X11, Emacs reacts to Xft changes made by configuration tools, via the XSETTINGS mechanism. This includes antialias, hinting, hintstyle, RGBA, DPI and lcdfilter changes. @@ -143,7 +143,7 @@ ** Completion changes *** The new command `completion-at-point' provides mode-sensitive completion. - ++++ *** tab-always-indent set to `complete' lets TAB do completion as well. +++ *** The new completion-style `initials' is available. @@ -185,6 +185,7 @@ ** LaTeX mode now provides completion (via completion-at-point). +--- ** sym-comp.el is now declared obsolete, superceded by completion-at-point. ** lucid.el and levents.el are now declared obsolete. @@ -197,20 +198,16 @@ *** The Calc settings file is now a file named calc.el in user-emacs-directory; but the old location, ~/.calc.el, is used if that file exists. - --- *** Graphing commands (`g f' etc.) now work on MS-Windows, if you have the native Windows port of Gnuplot version 3.8 or later installed. ** Calendar and diary - +++ *** Fancy diary display is now the default. If you prefer the simple display, customize `diary-display-function'. - +++ *** The diary's fancy display now enables view-mode. - --- *** The command `calendar-current-date' accepts an optional argument giving an offset from today. @@ -225,9 +222,9 @@ `desktop-files-not-to-save' instead. ** Dired - -*** The new variable `dired-auto-revert-buffer' allows to revert -dired buffers automatically on revisiting. ++++ +*** The new variable `dired-auto-revert-buffer', if non-nil, causes +Dired buffers to be reverted automatically on revisiting them. ** DocView @@ -338,22 +335,17 @@ are stripped when copying text from the ChangeLog to the *VC-Log* buffer. ** Elint - --- *** Elint now uses compilation-mode. - --- *** Elint can now scan individual files and whole directories, and can be run in batch mode. - --- *** Elint does a more thorough initialization, and recognizes more built-in functions and variables. Customize `elint-scan-preloaded' if you want to sacrifice some accuracy for a faster startup. - --- *** Elint attempts some basic understanding of featurep and (f)boundp tests. - --- *** Customize `elint-ignored-warnings' to suppress some warnings. @@ -368,7 +360,7 @@ `comint-history-isearch' is non-nil. New commands `comint-history-isearch-backward' and `comint-history-isearch-backward-regexp' (bound to M-r) start Isearch in the input history regardless of the value of `comint-history-isearch'. - ++++ *** Interactively `multi-isearch-buffers' and `multi-isearch-buffers-regexp' read buffer names to search, one by one, ended with RET. With a prefix argument, they ask for a regexp, and search in buffers whose names match @@ -376,19 +368,16 @@ `multi-isearch-files-regexp' read file names to search, one by one, ended with RET. With a prefix argument, they ask for a wildcard, and search in file buffers whose file names match the specified wildcard. - +++ *** Autorevert Tail mode now works also for remote files. - +++ *** The new built-in commands `su' and `sudo' support Tramp. That means, they change `default-directory' to the new users value, and let commands run under that user permissions. It works even when `default-directory' is already remote. Calling the external commands is possible by `*su' or `*sudo', repectively. - --- -*** When running in a new enough xterm (newer than version 242), emacs +*** When running in a new enough xterm (newer than version 242), Emacs asks xterm what the background color is and it sets up faces accordingly for a dark background if needed (the current default is to consider the background light). @@ -468,70 +457,94 @@ * Lisp changes in Emacs 23.2 -** make-network-socket can now also create `seqpacket' Unix sockets. - -** New function `completion-in-region' to use the standard completion -facilities on a particular region of text. - -+++ -** The 4th arg to all-completions (aka hide-spaces) is declared obsolete. - ---- -** read-file-name-predicate is obsolete. It was used to pass the predicate -to read-file-name-internal because read-file-name-internal abused its `pred' -argument to pass the current directory, but this hack is not needed -any more. +** All the default-FOO variables that hold the default value of the FOO +variable, are now declared obsolete. + +** read-key is a function halfway between read-event and read-key-sequence. +It reads a single key, but obeys input and escape sequence decoding. ** Frame parameter changes - +++ *** You can give the `fullscreen' frame parameter the value `maximized'. This maximizes the frame. - +++ *** The new frame parameter `sticky' makes Emacs frames sticky in virtual desktops. ---- -** completion-base-size is obsoleted by completion-base-position. +** Completion changes + +*** completion-base-size is obsoleted by completion-base-position. This change causes a few backward incompatibilities, mostly with choose-completion-string-functions where the `mini-p' argument has been replaced by a `base-position' argument, and where the `base-size' argument is now always nil. +*** New function `completion-in-region' to use the standard completion +facilities on a particular region of text. ++++ +*** The 4th arg to all-completions (aka hide-spaces) is declared obsolete. + +*** completion-annotate-function specifies how to compute annotations +for completions displayed in *Completions*. + +** Minibuffer changes +--- +*** read-file-name-predicate is obsolete. It was used to pass the predicate +to read-file-name-internal because read-file-name-internal abused its `pred' +argument to pass the current directory, but this hack is not needed +any more. + +** Changes to file-manipulation functions ++++ +*** `delete-directory' has an optional parameter RECURSIVE. ++++ +*** New function `copy-directory', which copies a directory recursively. + ** called-interactively-p now takes one argument and replaces interactive-p which is now marked obsolete. + ** New function set-advertised-calling-convention makes it possible to obsolete arguments as well as make some arguments mandatory. -** eval-next-after-load is obsolete. -** New hook `after-load-functions' run after loading an Elisp file. ** You can control which binding is preferentially shown in menus and docstrings by adding a `:advertised-binding' property to the corresponding command's symbol. That property can hold a single binding or a list of bindings. +** Network and process changes ++++ +*** start-process-shell-command and start-file-process-shell-command +now only take a single `command' argument. ++++ +*** The new variable `process-file-side-effects' should be set to nil +if a `process-file' call does not change a remote file. This allows +file name handlers such as Tramp to optimizations. ++++ +*** make-network-process can now also create `seqpacket' Unix sockets. + +** Loading changes + +*** eval-next-after-load is obsolete. + +*** New hook `after-load-functions' run after loading an Elisp file. + +** Byte compilation changes +--- +*** Changing the file-names generated by byte-compilation by redefining +the function `byte-compile-dest-file' before loading bytecomp.el is obsolete. +Instead, customize byte-compile-dest-file-function. +--- +*** `byte-compile-warnings' has new members, `constants' and `suspicious'. + ** New macro with-silent-modifications to tweak text properties without affecting the buffer's modification state. -** All the default-FOO variables that hold the default value of the FOO -variable, are now declared obsolete. - -** read-key is a function halfway between read-event and read-key-sequence. -It reads a single key, but obeys input and escape sequence decoding. - -** start-process-shell-command and start-file-process-shell-command -now only take a single `command' argument. - -** The variable `process-file-side-effects' shall be bound to nil, if -a `process-file' call does not change a remote file. By this, file -name handlers like Tramp can apply optimizations. +++ ** Hash tables have a new printed representation that is readable. The feature `hashtable-print-readable' identifies this new functionality. -** New functions performing Unicode normalization are added: +** New functions for performing Unicode normalization: ucs-normalize-NFD-region, ucs-normalize-NFD-string, ucs-normalize-NFC-region, ucs-normalize-NFC-string, ucs-normalize-NFKD-region, ucs-normalize-NFKD-string, @@ -539,25 +552,10 @@ ucs-normalize-HFS-NFD-region, ucs-normalize-HFS-NFD-string, ucs-normalize-HFS-NFC-region, ucs-normalize-HFS-NFC-string. -** completion-annotate-function specifies how to compute annotations -for completions displayed in *Completions*. - +++ ** Face aliases can now be marked as obsolete, using the macro `define-obsolete-face-alias'. ---- -** Changing the file-names generated by byte-compilation by redefining -the function `byte-compile-dest-file' before loading bytecomp.el is obsolete. -Instead, customize byte-compile-dest-file-function. - ---- -** `byte-compile-warnings' has new members, `constants' and `suspicious'. - -** `delete-directory' has an optional parameter RECURSIVE. - -** New function `copy-directory', which copies a directory recursively. - +++ ** New function `window-full-height-p', analogous to the full-width version.
--- a/etc/PROBLEMS Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/PROBLEMS Fri Mar 26 15:03:20 2010 +0000 @@ -1418,6 +1418,21 @@ * Runtime problems on character terminals +** The meta key does not work on xterm. +Typing M-x rings the terminal bell, and inserts a string like ";120~". +For recent xterm versions (>= 216), Emacs uses xterm's modifyOtherKeys +feature to generate strings for key combinations that are not +otherwise usable. One circumstance in which this can cause problems +is if you have specified the X resource + + xterm*VT100.Translations + +to contain translations that use the meta key. Then xterm will not +use meta in modified function-keys, which confuses Emacs. To fix +this, you can remove the X resource or put this in your init file: + + (xterm-remove-modify-other-keys) + ** Emacs spontaneously displays "I-search: " at the bottom of the screen. This means that Control-S/Control-Q (XON/XOFF) "flow control" is being
--- a/etc/TODO Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/TODO Fri Mar 26 15:03:20 2010 +0000 @@ -105,9 +105,6 @@ ** erase-buffer should perhaps disregard read-only properties of text. -** Make occur correctly handle matches that span more than one line, - as well as overlapping matches. - ** Fix the kill/yank treatment of invisible text. At the moment, invisible text is placed in the kill-ring, so that the contents of the ring may not correspond to the text as displayed to the user.
--- a/etc/gnus/gnus-setup.ast Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/gnus/gnus-setup.ast Fri Mar 26 15:03:20 2010 +0000 @@ -33,6 +33,8 @@ @end text +@next 'finish + @node Setting up a NNTP server @text @@ -40,6 +42,8 @@ Run M-x assistant and use the news-server.ast file as input. @end text +@next 'finish + @c Local variables: @c mode: texinfo
--- a/etc/gnus/news-server.ast Mon Mar 22 10:47:09 2010 +0000 +++ b/etc/gnus/news-server.ast Fri Mar 26 15:03:20 2010 +0000 @@ -2,9 +2,9 @@ @node Setting up the news server name and port number -@variable server :string (gnus-getenv-nntpserver) +@variable server :string (or (gnus-getenv-nntpserver) "your-server-here") @variable port :number 119 -@validate (assistant-validate-connect-to-server server port) +@validate (or (assistant-validate-connect-to-server server port) (y-or-n-p "Do you want to use the server anyway, although you can't confirm it's valid?")) @result gnus-select-method (list 'nntp server (list 'nntp-server port)) @text Usenet news is usually read from your Internet service prodider's news @@ -14,10 +14,10 @@ Server name: @variable{server} Port number: @variable{port} + @end text @next t "User name and password" - @node User name and password @type interstitial @next
--- a/lisp/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,214 @@ +2010-03-25 Glenn Morris <rgm@gnu.org> + + * desktop.el (desktop-save-buffer-p): Don't mistakenly include + all dired buffers, even tramp ones. (Bug#5755) + +2010-03-25 Stefan Monnier <monnier@iro.umontreal.ca> + + Add "union tags" in mpc.el. + * mpc.el: Remove backward compatibility code. + (mpc-browser-tags): Change default. + (mpc--find-memoize-union-tags): New var. + (mpc-cmd-flush, mpc-cmd-special-tag-p): New fun. + (mpc-cmd-find): Handle the case where the playlist does not exist. + Handle union-tags. + (mpc-cmd-list): Use mpc-cmd-special-tag-p. Handle union-tags. + (mpc-cmd-add): Use mpc-cmd-flush. + (mpc-tagbrowser-tag-name): New fun. + (mpc-tagbrowser-buf): Use it. + (mpc-songs-refresh): Use cond. Move to point-min as a fallback. + +2010-03-24 Stefan Monnier <monnier@iro.umontreal.ca> + + Misc cleanup. + * progmodes/make-mode.el (makefile-bsdmake-rule-action-regex): + Use replace-regexp-in-string. + (makefile-mode-abbrev-table): Merge defvar and define-abbrev-table. + (makefile-imake-mode-syntax-table): Move init into defvar. + (makefile-mode): Use define-derived-mode. + + * progmodes/make-mode.el (makefile-rule-action-regex): Backtrack less. + (makefile-make-font-lock-keywords): Adjust rule since submatch 1 may + not be present any more. + +2010-03-24 Juanma Barranquero <lekktu@gmail.com> + + * faces.el (set-face-attribute): Fix typo in docstring. + (face-valid-attribute-values): Reflow docstring. + + * cedet/srecode/table.el (srecode-template-table): Fix docstring typo. + +2010-03-24 Glenn Morris <rgm@gnu.org> + + * textmodes/flyspell.el (sgml-lexical-context): Autoload it (Bug#5752). + +2010-03-24 Chong Yidong <cyd@stupidchicken.com> + + * indent.el (indent-for-tab-command): Doc fix. + +2010-03-24 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-engine.el (c-remove-stale-state-cache): + Fix off-by-one error. Fixes bug #5747. + +2010-03-24 Juanma Barranquero <lekktu@gmail.com> + + * image-dired.el (image-dired-display-thumbs): Fix typo in docstring. + (image-dired-read-comment): Doc fix. + + * json.el (json-object-type, json-array-type, json-key-type) + (json-false, json-null, json-read-number): + * minibuffer.el (completion-in-region-functions): + * calendar/cal-tex.el (cal-tex-daily-end, cal-tex-number-weeks) + (cal-tex-cursor-week): + * emacs-lisp/trace.el (trace-function): + * eshell/em-basic.el (eshell/printnl): + * eshell/em-dirs.el (eshell-last-dir-ring, eshell-parse-drive-letter) + (eshell-read-last-dir-ring, eshell-write-last-dir-ring): + * obsolete/levents.el (allocate-event, event-key, event-object) + (event-point, event-process, event-timestamp, event-to-character) + (event-window, event-x, event-x-pixel, event-y, event-y-pixel): + * textmodes/reftex-vars.el (reftex-index-macros-builtin) + (reftex-section-levels, reftex-auto-recenter-toc, reftex-toc-mode-hook) + (reftex-cite-punctuation, reftex-search-unrecursed-path-first) + (reftex-highlight-selection): Fix typos in docstrings. + +2010-03-24 Juanma Barranquero <lekktu@gmail.com> + + * minibuffer.el (completion-in-region-functions): Fix docstring typos. + +2010-03-24 Glenn Morris <rgm@gnu.org> + + * mail/rmail.el (rmail-highlight-face): Restore option deleted + 2008-02-13 without comment; mark it obsolete. + (rmail-highlight-headers): Use rmail-highlight-face once more. + +2010-03-24 Chong Yidong <cyd@stupidchicken.com> + + * woman.el (woman2-process-escapes): Only consume the newline if + the filler character is on a line by itself (Bug#5729). + +2010-03-24 Kenichi Handa <handa@m17n.org> + + * language/indian.el (devanagari-composable-pattern): Add more + consonants. + +2010-03-24 Michael Albinus <michael.albinus@gmx.de> + + * net/trampver.el: Update release number. + +2010-03-24 Glenn Morris <rgm@gnu.org> + + * Makefile.in (ELCFILES): Add cedet/semantic/imenu.el. + +2010-03-24 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-find-executable): + Use `tramp-get-connection-buffer'. Make the regexp for checking + output of "wc -l" more robust. + (tramp-find-shell): Use another shell but /bin/sh on OpenSolaris. + (tramp-open-connection-setup-interactive-shell): Remove workaround + for OpenSolaris bug, it is not needed anymore. + +2010-03-24 Eric M. Ludlam <zappo@gnu.org> + + * cedet/semantic/imenu.el: New file, from the CEDET repository + (Bug#5412). + +2010-03-24 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/cl-macs.el (defsubst*): Add autoload cookie. (Bug#4427) + +2010-03-24 Wilson Snyder <wsnyder@wsnyder.org> + + * files.el (auto-mode-alist): Accept more verilog file patterns. + +2010-03-24 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-dir.el (vc-dir-headers): Abbreviate the working dir. + +2010-03-24 Glenn Morris <rgm@gnu.org> + + * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to + log-edit-before-checkin-process. + + * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry. + + * vc.el, vc-bzr.el, vc-hg.el (log-edit-mode): Declare. + + * vc-dispatcher.el (vc-start-logentry): Doc fix. + (log-view-process-buffer, log-edit-extra-flags): Declare. + + * log-edit.el (log-edit-before-checkin-process): Doc fix. + + * cedet/semantic/bovine/c.el (semantic-c-describe-environment): + Consistently check ede-object is bound throughout. + + * cedet/ede/project-am.el (ede-shell-run-something): Declare. + +2010-03-23 Sam Steingold <sds@gnu.org> + + Fix bug#5620: recalculate all markers on compilation buffer + modifications, not on file modifications. + * progmodes/compile.el (buffer-modtime): New buffer-local variable: + the buffer modification time, for buffers not associated with files. + (compilation-mode): Create it. + (compilation-filter): Update it. + (compilation-next-error-function): Use it instead of + `visited-file-modtime' for timestamp. + +2010-03-23 Juri Linkov <juri@jurta.org> + + Implement Occur multi-line matches. + http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01044.html + + * replace.el (occur): Doc fix. + (occur-engine): Set `begpt' to the beginning of the first line. + Set `endpt' to the end of the last match line. At first, count + line numbers between `origpt' and `begpt'. Split out code from + `out-line' variable to new let-bindings `match-prefix' and + `match-str'. In `out-line' add non-numeric prefix to all + non-first lines of multi-line matches. Finally, count lines + between `begpt' and `endpt' and add to `lines'. + +2010-03-23 Juri Linkov <juri@jurta.org> + + * replace.el (occur-accumulate-lines, occur-engine): + Use `occur-engine-line' instead of duplicate code. + (occur-engine-line): New function created from duplicate code + in `occur-accumulate-lines' and `occur-engine'. + + * replace.el (occur-engine-line): Add optional arg `keep-props'. + (occur-accumulate-lines, occur-engine): Add arg `keep-props'. + +2010-03-23 Juri Linkov <juri@jurta.org> + + * finder.el: Remove TODO tasks. + + * info.el (Info-finder-find-node): Add node "all" + with all package info. Handle a list of multiple keywords + separated by comma. + (info-finder): In interactive use with a prefix argument, + use `completing-read-multiple' to read a list of keywords + separated by comma. + +2010-03-23 Stefan Monnier <monnier@iro.umontreal.ca> + + Add a new completion style `substring'. + * minibuffer.el (completion-basic--pattern): New function. + (completion-basic-try-completion, completion-basic-all-completions): + Use it. + (completion-substring--all-completions) + (completion-substring-try-completion) + (completion-substring-all-completions): New functions. + (completion-styles-alist): New style `substring'. + +2010-03-22 Stefan Monnier <monnier@iro.umontreal.ca> + + Get rid of .elc files after removal of the corresponding .el. + * Makefile.in (compile-clean): New target. + (compile-main): Use it. + 2010-03-22 Jan Djärv <jan.h.d@swipnet.se> * Makefile.in (compile-main): cd to $(lisp) in a sub-shell, so we @@ -19,7 +230,8 @@ (srcdir): Don't append `/..'. (EMACS): Use ${abs_top_builddir}. (all, compile, compile-always, compile-last): Don't set emacswd. - (update-subdirs, update-authors): Use $(top_srcdir) instead of $(srcdir). + (update-subdirs, update-authors): Use $(top_srcdir) instead of + $(srcdir). (lisp): Use $(srcdir) instead of @srcdir@. 2010-03-21 Juri Linkov <juri@jurta.org>
--- a/lisp/Makefile.in Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/Makefile.in Fri Mar 26 15:03:20 2010 +0000 @@ -235,7 +235,7 @@ # Compile all the Elisp files that need it. Beware: it approximates # `no-byte-compile', so watch out for false-positives! -compile-main: +compile-main: compile-clean @(cd $(lisp); $(setwins); \ els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ for el in $$els; do \ @@ -247,6 +247,18 @@ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done +.PHONY: compile-clean +# Erase left-over .elc files that do not have a corresponding .el file. +compile-clean: + @cd $(lisp); $(setwins); \ + elcs=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.elc |g'`; \ + for el in $$(echo $$elcs | sed -e 's/\.elc/\.el/g'); do \ + if test -f "$$el" -o \! -f "$${el}c"; then :; else \ + echo rm "$${el}c"; \ + rm "$${el}c"; \ + fi \ + done + # Compile all Lisp files, but don't recompile those that are up to # date. Some .el files don't get compiled because they set the # local variable no-byte-compile.
--- a/lisp/calendar/cal-tex.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/calendar/cal-tex.el Fri Mar 26 15:03:20 2010 +0000 @@ -134,7 +134,7 @@ (defcustom cal-tex-daily-end 20 "The last hour of the daily LaTeX calendar page. -At present, this only affects `cal-tex-cursor-day'" +At present, this only affects `cal-tex-cursor-day'." :type 'integer :group 'calendar-tex) @@ -654,7 +654,7 @@ (defun cal-tex-number-weeks (month year n) "Determine the number of weeks in a range of dates. -Compute the number of weeks in the calendar starting with MONTH and YEAR, +Compute the number of weeks in the calendar starting with MONTH and YEAR, and lasting N months, including only the days in WHICH-DAYS. As it stands, this is only an upper bound." (let ((d (list month 1 year))) @@ -683,7 +683,7 @@ (defun cal-tex-cursor-week (&optional n event) "Make a LaTeX calendar buffer for a two-page one-week calendar. It applies to the week that point is in. The optional prefix -argument N specifies the number of weeks (default 1). The calendar +argument N specifies number of weeks (default 1). The calendar shows holidays if `cal-tex-holidays' is non-nil (note that diary entries are not shown). The calendar shows the hours 8-12am, 1-5pm." (interactive (list (prefix-numeric-value current-prefix-arg) @@ -1778,7 +1778,7 @@ (cal-tex-comment "end framebox")) -(defun cal-tex-b-makebox ( width position ) +(defun cal-tex-b-makebox (width position) "Insert makebox with parameters WIDTH and POSITION (clr)." (insert "\\makebox[" width "][" position "]{" ) (cal-tex-comment))
--- a/lisp/cedet/ede/project-am.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/cedet/ede/project-am.el Fri Mar 26 15:03:20 2010 +0000 @@ -402,6 +402,8 @@ (funcall project-am-debug-target-function cmd)) (kill-buffer tb)))) +(declare-function ede-shell-run-something "ede/shell") + (defmethod project-run-target ((obj project-am-objectcode)) "Run the current project target in comint buffer." (let ((tb (get-buffer-create " *padt*"))
--- a/lisp/cedet/semantic/bovine/c.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/cedet/semantic/bovine/c.el Fri Mar 26 15:03:20 2010 +0000 @@ -1761,8 +1761,9 @@ (when (arrayp semantic-lex-spp-project-macro-symbol-obarray) (princ "\n Project symbol map:\n") - (princ " Your project symbol map is derived from the EDE object:\n ") - (princ (object-print ede-object)) + (when (and (boundp 'ede-object) ede-object) + (princ " Your project symbol map is derived from the EDE object:\n ") + (princ (object-print ede-object))) (princ "\n\n") (let ((macros nil)) (mapatoms
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/cedet/semantic/imenu.el Fri Mar 26 15:03:20 2010 +0000 @@ -0,0 +1,537 @@ +;;; semantic/imenu.el --- Use Semantic as an imenu tag generator + +;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 +;; Free Software Foundation, Inc. + +;; Author: Eric M. Ludlam <zappo@gnu.org> +;; Maintainer: Eric Ludlam + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: +;; +;; This support function can be used in any buffer which supports +;; the bovinator to create the imenu index. +;; +;; To use this in a buffer, do this in a hook. +;; +;; (add-hook 'mode-hook +;; (lambda () +;; (setq imenu-create-index-function 'semantic-create-imenu-index) +;; )) + +(require 'semantic) +(require 'semantic/format) +(require 'semantic/db) +(require 'semantic/db-file) +(require 'semantic/sort) +(require 'imenu) + +(declare-function pulse-momentary-highlight-one-line "pulse" (o &optional face)) +(declare-function semanticdb-semantic-init-hook-fcn "db-mode") + +;; Because semantic imenu tags will hose the current imenu handling +;; code in speedbar, force semantic/sb in. +(if (featurep 'speedbar) + (require 'semantic/sb) + (add-hook 'speedbar-load-hook (lambda () (require 'semantic/sb)))) + +(defgroup semantic-imenu nil + "Semantic interface to Imenu." + :group 'semantic + :group 'imenu + ) + +;;;###autoload +(defcustom semantic-imenu-summary-function 'semantic-format-tag-abbreviate + "*Function to use when creating items in Imenu. +Some useful functions are found in `semantic-format-tag-functions'." + :group 'semantic-imenu + :type semantic-format-tag-custom-list) +(make-variable-buffer-local 'semantic-imenu-summary-function) + +;;;###autoload +(defcustom semantic-imenu-bucketize-file t + "*Non-nil if tags in a file are to be grouped into buckets." + :group 'semantic-imenu + :type 'boolean) +(make-variable-buffer-local 'semantic-imenu-bucketize-file) + +(defcustom semantic-imenu-adopt-external-members t + "*Non-nil if types in a file should adopt externally defined members. +C++ and CLOS can define methods that are not in the body of a class +definition." + :group 'semantic-imenu + :type 'boolean) + +(defcustom semantic-imenu-buckets-to-submenu t + "*Non-nil if buckets of tags are to be turned into submenus. +This option is ignored if `semantic-imenu-bucketize-file' is nil." + :group 'semantic-imenu + :type 'boolean) +(make-variable-buffer-local 'semantic-imenu-buckets-to-submenu) + +;;;###autoload +(defcustom semantic-imenu-expand-type-members t + "*Non-nil if types should have submenus with members in them." + :group 'semantic-imenu + :type 'boolean) +(make-variable-buffer-local 'semantic-imenu-expand-type-members) +(semantic-varalias-obsolete 'semantic-imenu-expand-type-parts + 'semantic-imenu-expand-type-members "23.2") + +(defcustom semantic-imenu-bucketize-type-members t + "*Non-nil if members of a type should be grouped into buckets. +nil means to keep them in the same order. +Overriden to nil if `semantic-imenu-bucketize-file' is nil." + :group 'semantic-imenu + :type 'boolean) +(make-variable-buffer-local 'semantic-imenu-bucketize-type-parts) +(semantic-varalias-obsolete 'semantic-imenu-bucketize-type-parts + 'semantic-imenu-bucketize-type-members "23.2") + +(defcustom semantic-imenu-sort-bucket-function nil + "*Function to use when sorting tags in the buckets of functions. +See `semantic-bucketize' and the FILTER argument for more details on this function." + :group 'semantic-imenu + :type '(radio (const :tag "No Sorting" nil) + (const semantic-sort-tags-by-name-increasing) + (const semantic-sort-tags-by-name-decreasing) + (const semantic-sort-tags-by-type-increasing) + (const semantic-sort-tags-by-type-decreasing) + (const semantic-sort-tags-by-name-increasing-ci) + (const semantic-sort-tags-by-name-decreasing-ci) + (const semantic-sort-tags-by-type-increasing-ci) + (const semantic-sort-tags-by-type-decreasing-ci) + (function))) +(make-variable-buffer-local 'semantic-imenu-sort-bucket-function) + +(defcustom semantic-imenu-index-directory nil + "*Non nil to index the entire directory for tags. +Doesn't actually parse the entire directory, but displays tags for all files +currently listed in the current Semantic database. +This variable has no meaning if semanticdb is not active." + :group 'semantic-imenu + :type 'boolean) + +(defcustom semantic-imenu-auto-rebuild-directory-indexes nil + "*If non-nil automatically rebuild directory index imenus. +That is when a directory index imenu is updated, automatically rebuild +other buffer local ones based on the same semanticdb." + :group 'semantic-imenu + :type 'boolean) + +(defvar semantic-imenu-directory-current-file nil + "When building a file index, this is the file name currently being built.") + +(defvar semantic-imenu-auto-rebuild-running nil + "Non-nil if `semantic-imenu-rebuild-directory-indexes' is running.") + +;;;###autoload +(defvar semantic-imenu-expandable-tag-classes '(type) + "List of expandable tag classes. +Tags of those classes will be given submenu with children. +By default, a `type' has interesting children. In Texinfo, however, a +`section' has interesting children.") +(make-variable-buffer-local 'semantic-imenu-expandable-tag-classes) +(semantic-varalias-obsolete 'semantic-imenu-expandable-token + 'semantic-imenu-expandable-tag-classes "23.2") + +;;; Code: +(defun semantic-imenu-tag-overlay (tag) + "Return the overlay belonging to tag. +If TAG doesn't have an overlay, and instead as a vector of positions, +concoct a combination of file name, and position." + (let ((o (semantic-tag-overlay tag))) + (if (not (semantic-overlay-p o)) + (let ((v (make-vector 3 nil))) + (aset v 0 semantic-imenu-directory-current-file) + (aset v 1 (aref o 0)) + (aset v 2 (aref o 1)) + v) + o))) + + +(defun semantic-imenu-goto-function (name position &optional rest) + "Move point associated with NAME to POSITION. +Used to override function `imenu-default-goto-function' so that we can continue +to use overlays to maintain the current position. +Optional argument REST is some extra stuff." + (require 'pulse) + (if (semantic-overlay-p position) + (let ((os (semantic-overlay-start position)) + (ob (semantic-overlay-buffer position))) + (if os + (progn + (if (not (eq ob (current-buffer))) + (switch-to-buffer ob)) + (imenu-default-goto-function name os rest) + (pulse-momentary-highlight-one-line (point)) + ) + ;; This should never happen, but check anyway. + (message "Imenu is out of date, try again. (internal bug)") + (setq imenu--index-alist nil))) + ;; When the POSITION is actually a pair of numbers in an array, then + ;; the file isn't loaded into the current buffer. + (if (vectorp position) + (let ((file (aref position 0)) + (pos (aref position 1))) + (and file (find-file file)) + (imenu-default-goto-function name pos rest) + (pulse-momentary-highlight-one-line (point)) + ) + ;; When the POSITION is the symbol 'file-only' it means that this + ;; is a directory index entry and there is no tags in this + ;; file. So just jump to the beginning of the file. + (if (eq position 'file-only) + (progn + (find-file name) + (imenu-default-goto-function name (point-min) rest) + (pulse-momentary-highlight-one-line (point)) + ) + ;; Probably POSITION don't came from a semantic imenu. Try + ;; the default imenu goto function. + (condition-case nil + (progn + (imenu-default-goto-function name position rest) + (pulse-momentary-highlight-one-line (point)) + ) + (error + (message "Semantic Imenu override problem. (Internal bug)") + (setq imenu--index-alist nil))))) + )) + +(defun semantic-imenu-flush-fcn (&optional ignore) + "This function is called as a hook to clear the imenu cache. +It is cleared after any parsing. +IGNORE arguments." + (if (eq imenu-create-index-function 'semantic-create-imenu-index) + (setq imenu--index-alist nil + imenu-menubar-modified-tick 0)) + (remove-hook 'semantic-after-toplevel-cache-change-hook + 'semantic-imenu-flush-fcn t) + (remove-hook 'semantic-after-partial-cache-change-hook + 'semantic-imenu-flush-fcn t) + ) + +;;;###autoload +(defun semantic-create-imenu-index (&optional stream) + "Create an imenu index for any buffer which supports Semantic. +Uses the output of the Semantic parser to create the index. +Optional argument STREAM is an optional stream of tags used to create menus." + (setq imenu-default-goto-function 'semantic-imenu-goto-function) + (prog1 + (if (and semantic-imenu-index-directory + (featurep 'semanticdb) + (semanticdb-minor-mode-p)) + (semantic-create-imenu-directory-index + (or stream (semantic-fetch-tags-fast))) + (semantic-create-imenu-index-1 + (or stream (semantic-fetch-tags-fast)) nil)) + (semantic-make-local-hook 'semantic-after-toplevel-cache-change-hook) + (add-hook 'semantic-after-toplevel-cache-change-hook + 'semantic-imenu-flush-fcn nil t) + (semantic-make-local-hook 'semantic-after-partial-cache-change-hook) + (add-hook 'semantic-after-partial-cache-change-hook + 'semantic-imenu-flush-fcn nil t))) + +(defun semantic-create-imenu-directory-index (&optional stream) + "Create an IMENU tag index based on all files active in semanticdb. +Optional argument STREAM is the stream of tags for the current buffer." + (if (not semanticdb-current-database) + (semantic-create-imenu-index-1 stream nil) + ;; We have a database, list all files, with the current file on top. + (let ((index (list + (cons (oref semanticdb-current-table file) + (or (semantic-create-imenu-index-1 stream nil) + ;; No tags in this file + 'file-only)))) + (tables (semanticdb-get-database-tables semanticdb-current-database))) + (while tables + (let ((semantic-imenu-directory-current-file + (oref (car tables) file)) + tags) + (when (and (not (eq (car tables) semanticdb-current-table)) + (semanticdb-live-p (car tables)) + (semanticdb-equivalent-mode (car tables)) + ) + (setq tags (oref (car tables) tags) + index (cons (cons semantic-imenu-directory-current-file + (or (and tags + ;; don't pass nil stream because + ;; it will use the current + ;; buffer + (semantic-create-imenu-index-1 + (oref (car tables) tags) + nil)) + ;; no tags in the file + 'file-only)) + index))) + (setq tables (cdr tables)))) + + ;; If enabled automatically rebuild other imenu directory + ;; indexes based on the same Semantic database + (or (not semantic-imenu-auto-rebuild-directory-indexes) + ;; If auto rebuild already in progress does nothing + semantic-imenu-auto-rebuild-running + (unwind-protect + (progn + (setq semantic-imenu-auto-rebuild-running t) + (semantic-imenu-rebuild-directory-indexes + semanticdb-current-database)) + (setq semantic-imenu-auto-rebuild-running nil))) + + (nreverse index)))) + +(defun semantic-create-imenu-index-1 (stream &optional parent) + "Create an imenu index for any buffer which supports Semantic. +Uses the output of the Semantic parser to create the index. +STREAM is a stream of tags used to create menus. +Optional argument PARENT is a tag parent of STREAM." + (let ((tags stream) + (semantic-imenu-adopt-external-members + semantic-imenu-adopt-external-members)) + ;; If we should regroup, do so. + (if semantic-imenu-adopt-external-members + (setq tags (semantic-adopt-external-members tags) + ;; Don't allow recursion here. + semantic-imenu-adopt-external-members nil)) + ;; Test for bucketing vs not. + (if semantic-imenu-bucketize-file + (let ((buckets (semantic-bucketize + tags parent + semantic-imenu-sort-bucket-function)) + item name + index) + (cond + ((null buckets) + nil) + ((or (cdr-safe buckets) ;; if buckets has more than one item in it. + (not semantic-imenu-buckets-to-submenu)) ;; to force separators between buckets + (while buckets + (setq name (car (car buckets)) + item (cdr (car buckets))) + (if semantic-imenu-buckets-to-submenu + (progn + ;; Make submenus + (if item + (setq index + (cons (cons name + (semantic-create-imenu-subindex item)) + index)))) + ;; Glom everything together with "---" between + (if item + (setq index + (append index + ;; do not create a menu separator in the parent menu + ;; when creating a sub-menu + (if (memq (semantic-tag-class (car item)) + semantic-imenu-expandable-tag-classes) + (semantic-create-imenu-subindex item) + (cons + '("---") + (semantic-create-imenu-subindex item))))) + )) + (setq buckets (cdr buckets))) + (if semantic-imenu-buckets-to-submenu + (nreverse index) + index)) + (t + (setq name (car (car buckets)) + item (cdr (car buckets))) + (semantic-create-imenu-subindex item)))) + ;; Else, group everything together + (semantic-create-imenu-subindex tags)))) + +(defun semantic-create-imenu-subindex (tags) + "From TAGS, create an imenu index of interesting things." + (let ((notypecheck (not semantic-imenu-expand-type-members)) + children index tag parts) + (while tags + (setq tag (car tags) + children (semantic-tag-components-with-overlays tag)) + (if (and (not notypecheck) + (memq (semantic-tag-class tag) + semantic-imenu-expandable-tag-classes) + children + ) + ;; to keep an homogeneous menu organisation, type menu items + ;; always have a sub-menu with at least the *definition* + ;; item (even if the tag has no type components) + (progn + (setq parts children) + ;; There is options which create the submenu + ;; * Type has an overlay, but children do. + ;; The type doesn't have to have it's own overlay, + ;; but a type with no overlay and no children should be + ;; invalid. + (setq index + (cons + (cons + (funcall semantic-imenu-summary-function tag) + ;; Add a menu for getting at the type definitions + (if (and parts + ;; Note to self: enable menu items for + ;; sub parts even if they are not proper + ;; tags. + (semantic-tag-p (car parts))) + (let ((submenu + (if (and semantic-imenu-bucketize-type-members + semantic-imenu-bucketize-file) + (semantic-create-imenu-index-1 parts tag) + (semantic-create-imenu-subindex parts)))) + ;; Only add a *definition* if we have a postion + ;; in that type tag. + (if (semantic-tag-with-position-p tag) + (cons + (cons "*definition*" + (semantic-imenu-tag-overlay tag)) + submenu) + submenu)) + ;; There were no parts, or something like that, so + ;; instead just put the definition here. + (if (semantic-tag-with-position-p tag) + (semantic-imenu-tag-overlay tag) + nil) + )) + index))) + (if (semantic-tag-with-position-p tag) + (setq index (cons + (cons + (funcall semantic-imenu-summary-function tag) + (semantic-imenu-tag-overlay tag)) + index)))) + (setq tags (cdr tags))) + ;; `imenu--split-submenus' sort submenus according to + ;; `imenu-sort-function' setting and split them up if they are + ;; longer than `imenu-max-items'. + (imenu--split-submenus (nreverse index)))) + +;;; directory imenu rebuilding. +;; +(defun semantic-imenu-rebuild-directory-indexes (db) + "Rebuild directory index imenus based on Semantic database DB." + (let ((l (buffer-list)) + b) + (while l + (setq b (car l) + l (cdr l)) + (if (and (not (eq b (current-buffer))) + (buffer-live-p b)) + (with-current-buffer b + ;; If there is a buffer local Semantic index directory + ;; imenu + (when (and (eq imenu-create-index-function + 'semantic-create-imenu-index) + semanticdb-current-database + (eq semanticdb-current-database db)) + ;; Rebuild the imenu + (imenu--cleanup) + (setq imenu--index-alist nil) + (funcall + (if (fboundp 'imenu-menu-filter) + ;; XEmacs imenu + 'imenu-menu-filter + ;; Emacs imenu + 'imenu-update-menubar)))))))) + +(defun semantic-imenu-semanticdb-hook () + "Function to be called from `semanticdb-mode-hook'. +Clears all imenu menus that may be depending on the database." + (require 'semantic/db-mode) + (semantic-map-buffers + #'(lambda () + ;; Set up semanticdb environment if enabled. + (if (semanticdb-minor-mode-p) + (semanticdb-semantic-init-hook-fcn)) + ;; Clear imenu cache to redraw the imenu. + (semantic-imenu-flush-fcn)))) + +(add-hook 'semanticdb-mode-hook 'semantic-imenu-semanticdb-hook) + +;;; Interactive Utilities +;; +(defun semantic-imenu-toggle-bucketize-file () + "Toggle the ability of imenu to bucketize the current file." + (interactive) + (setq semantic-imenu-bucketize-file (not semantic-imenu-bucketize-file)) + ;; Force a rescan + (setq imenu--index-alist nil)) + +(defun semantic-imenu-toggle-buckets-to-submenu () + "Toggle the ability of imenu to turn buckets into submenus." + (interactive) + (setq semantic-imenu-buckets-to-submenu (not semantic-imenu-buckets-to-submenu)) + ;; Force a rescan + (setq imenu--index-alist nil)) + +(defun semantic-imenu-toggle-bucketize-type-parts () + "Toggle the ability of imenu to bucketize the current file." + (interactive) + (setq semantic-imenu-bucketize-type-members (not semantic-imenu-bucketize-type-members)) + ;; Force a rescan + (setq imenu--index-alist nil)) + +;;; Which function support +;; +;; The which-function library will display the current function in the +;; mode line. It tries do do this through imenu. With a semantic parsed +;; buffer, there is a much more efficient way of doing this. +;; Advise `which-function' so that we optionally use semantic tags +;; instead, and get better stuff. +(require 'advice) + +(defvar semantic-which-function 'semantic-default-which-function + "Function to convert semantic tags into `which-function' text.") + +(defcustom semantic-which-function-use-color nil + "*Use color when displaying the current function with `which-function'." + :group 'semantic-imenu + :type 'boolean) + +(defun semantic-default-which-function (taglist) + "Convert TAGLIST into a string usable by `which-function'. +Returns the first tag name in the list, unless it is a type, +in which case it concatenates them together." + (cond ((eq (length taglist) 1) + (semantic-format-tag-abbreviate + (car taglist) nil semantic-which-function-use-color)) + ((memq (semantic-tag-class (car taglist)) + semantic-imenu-expandable-tag-classes) + (concat (semantic-format-tag-name + (car taglist) nil semantic-which-function-use-color) + (car semantic-type-relation-separator-character) + ;; recurse until we no longer have a type + ;; or any tags left. + (semantic-default-which-function (cdr taglist)))) + (t (semantic-format-tag-abbreviate + (car taglist) nil semantic-which-function-use-color)))) + +;; (defadvice which-function (around semantic-which activate) +;; "Choose the function to display via semantic if it is currently active." +;; (if (and (featurep 'semantic) semantic--buffer-cache) +;; (let ((ol (semantic-find-tag-by-overlay))) +;; (setq ad-return-value (funcall semantic-which-function ol))) +;; ad-do-it)) + +(provide 'semantic/imenu) + +;; Local variables: +;; generated-autoload-file: "loaddefs.el" +;; generated-autoload-load-name: "semantic/imenu" +;; End: + +;;; semantic/imenu.el ends here
--- a/lisp/cedet/srecode/table.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/cedet/srecode/table.el Fri Mar 26 15:03:20 2010 +0000 @@ -66,7 +66,7 @@ If this is nil, then this template table belongs to a set of generic templates that can be used with no additional dictionary values. When it is non-nil, it is assumed the template macros need specialized -Emacs Lisp code to fill in the dictoinary.") +Emacs Lisp code to fill in the dictionary.") (priority :initarg :priority :type number :documentation
--- a/lisp/desktop.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/desktop.el Fri Mar 26 15:03:20 2010 +0000 @@ -1,7 +1,8 @@ ;;; desktop.el --- save partial status of Emacs when killed ;; Copyright (C) 1993, 1994, 1995, 1997, 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. ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: convenience @@ -811,19 +812,23 @@ FILENAME is the visited file name, BUFNAME is the buffer name, and MODE is the major mode. \n\(fn FILENAME BUFNAME MODE)" - (let ((case-fold-search nil)) + (let ((case-fold-search nil) + dired-skip) (and (not (and (stringp desktop-buffers-not-to-save) (not filename) (string-match desktop-buffers-not-to-save bufname))) (not (memq mode desktop-modes-not-to-save)) + ;; FIXME this is broken if desktop-files-not-to-save is nil. (or (and filename (stringp desktop-files-not-to-save) (not (string-match desktop-files-not-to-save filename))) (and (eq mode 'dired-mode) (with-current-buffer bufname - (not (string-match desktop-files-not-to-save - default-directory)))) + (not (setq dired-skip + (string-match desktop-files-not-to-save + default-directory))))) (and (null filename) + (null dired-skip) ; bug#5755 (with-current-buffer bufname desktop-save-buffer)))))) ;; ----------------------------------------------------------------------------
--- a/lisp/emacs-lisp/cl-loaddefs.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/emacs-lisp/cl-loaddefs.el Fri Mar 26 15:03:20 2010 +0000 @@ -273,8 +273,8 @@ ;;;*** -;;;### (autoloads (compiler-macroexpand define-compiler-macro assert -;;;;;; check-type typep deftype cl-struct-setf-expander defstruct +;;;### (autoloads (defsubst* compiler-macroexpand define-compiler-macro +;;;;;; assert check-type typep deftype cl-struct-setf-expander defstruct ;;;;;; define-modify-macro callf2 callf letf* letf rotatef shiftf ;;;;;; remf cl-do-pop psetf setf get-setf-method defsetf define-setf-method ;;;;;; declare the locally multiple-value-setq multiple-value-bind @@ -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" "e10a7e42199c08dc39460f67dd2d424b") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "273ba25f4a116c61a464dbe55f1f8c63") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -739,6 +739,14 @@ \(fn FORM)" nil nil) +(autoload 'defsubst* "cl-macs" "\ +Define NAME as a function. +Like `defun', except the function is automatically declared `inline', +ARGLIST allows full Common Lisp conventions, and BODY is implicitly +surrounded by (block NAME ...). + +\(fn NAME ARGLIST [DOCSTRING] BODY...)" nil (quote macro)) + ;;;*** ;;;### (autoloads (tree-equal nsublis sublis nsubst-if-not nsubst-if
--- a/lisp/emacs-lisp/cl-macs.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/emacs-lisp/cl-macs.el Fri Mar 26 15:03:20 2010 +0000 @@ -1,7 +1,7 @@ ;;; cl-macs.el --- Common Lisp macros -;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 @@ -2596,6 +2596,7 @@ (byte-compile-normal-call form) (byte-compile-form form))) +;;;###autoload (defmacro defsubst* (name args &rest body) "Define NAME as a function. Like `defun', except the function is automatically declared `inline',
--- a/lisp/emacs-lisp/trace.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/emacs-lisp/trace.el Fri Mar 26 15:03:20 2010 +0000 @@ -253,7 +253,7 @@ For every call of FUNCTION Lisp-style trace messages that display argument and return values will be inserted into BUFFER. This function generates the trace advice for FUNCTION and activates it together with any other advice -there might be!! The trace BUFFER will popup whenever FUNCTION is called. +there might be!! The trace BUFFER will popup whenever FUNCTION is called. Do not use this to trace functions that switch buffers or do any other display oriented stuff, use `trace-function-background' instead." (interactive
--- a/lisp/eshell/em-basic.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/eshell/em-basic.el Fri Mar 26 15:03:20 2010 +0000 @@ -125,7 +125,7 @@ (eshell-echo args output-newline))) (defun eshell/printnl (&rest args) - "Print out each of the argument, separated by newlines." + "Print out each of the arguments, separated by newlines." (let ((elems (eshell-flatten-list args))) (while elems (eshell-printn (eshell-echo (list (car elems))))
--- a/lisp/eshell/em-dirs.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/eshell/em-dirs.el Fri Mar 26 15:03:20 2010 +0000 @@ -178,7 +178,7 @@ Thus, this does not include the current directory.") (defvar eshell-last-dir-ring nil - "The last directory that eshell was in.") + "The last directory that Eshell was in.") ;;; Functions: @@ -267,7 +267,7 @@ (char-to-string (char-before)))) (defun eshell-parse-drive-letter () - "An argument beginning X:[^/] is a drive letter reference." + "An argument beginning with X:[^/] is a drive letter reference." (when (and (not eshell-current-argument) (looking-at "\\([A-Za-z]:\\)\\([^/\\\\]\\|\\'\\)")) (goto-char (match-end 1)) @@ -517,7 +517,7 @@ msg))) (defun eshell-read-last-dir-ring () - "Sets the buffer's `eshell-last-dir-ring' from a history file." + "Set the buffer's `eshell-last-dir-ring' from a history file." (let ((file eshell-last-dir-ring-file-name)) (cond ((or (null file) @@ -545,7 +545,7 @@ (setq eshell-last-dir-ring ring)))))) (defun eshell-write-last-dir-ring () - "Writes the buffer's `eshell-last-dir-ring' to a history file." + "Write the buffer's `eshell-last-dir-ring' to a history file." (let ((file eshell-last-dir-ring-file-name)) (cond ((or (null file)
--- a/lisp/faces.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/faces.el Fri Mar 26 15:03:20 2010 +0000 @@ -590,7 +590,7 @@ attribute is changed on all frames). ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid -face attribute name. All attributes can be set to `unspecified'; +face attribute name. All attributes can be set to `unspecified'; this fact is not further mentioned below. The following attributes are recognized: @@ -988,9 +988,9 @@ (defun face-valid-attribute-values (attribute &optional frame) "Return valid values for face attribute ATTRIBUTE. The optional argument FRAME is used to determine available fonts -and colors. If it is nil or not specified, the selected frame is -used. Value is an alist of (NAME . VALUE) if ATTRIBUTE expects a value -out of a set of discrete values. Value is `integerp' if ATTRIBUTE expects +and colors. If it is nil or not specified, the selected frame is used. +Value is an alist of (NAME . VALUE) if ATTRIBUTE expects a value out +of a set of discrete values. Value is `integerp' if ATTRIBUTE expects an integer value." (let ((valid (case attribute
--- a/lisp/finder.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/finder.el Fri Mar 26 15:03:20 2010 +0000 @@ -27,12 +27,6 @@ ;; This mode uses the Keywords library header to provide code-finding ;; services by keyword. -;; -;; Things to do: -;; 1. Support multiple keywords per search. This could be extremely hairy; -;; there doesn't seem to be any way to get completing-read to exit on -;; an EOL with no substring pending, which is what we'd want to end the loop. -;; 2. Search by string in synopsis line? ;;; Code:
--- a/lisp/gnus/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,103 @@ +2010-03-24 Juanma Barranquero <lekktu@gmail.com> + + * message.el (message-interactive): Doc fix. + (message-qmail-inject-args): Reflow. + (message-kill-to-signature): Fix typo in docstring. + + * smiley.el (smiley-buffer): Fix typo in docstring. + +2010-03-24 Glenn Morris <rgm@gnu.org> + + * mail-source.el (gnus-message): Declare. + (mail-source-delete-old-incoming): Require gnus-util. + +2010-03-23 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (canlock-verify): Autoload it for Emacs 21. + + * message.el (ecomplete-setup): Autoload it for Emacs <23. + + * mml-sec.el (mml-secure-cache-passphrase): Default to t that is + password-cache's default if it is not bound. + (mml-secure-passphrase-cache-expiry): Default to 16 that is + password-cache-expiry's default if it is not bound. + + * pop3.el (pop3-list): Don't use 3rd arg of `split-string' which is not + available in Emacs 21. + +2010-03-23 Teodor Zlatanov <tzz@lifelogs.com> + + * auth-source.el (auth-sources): Fix up definition so extra parameters + are always inline. + +2010-03-22 Martin Stjernholm <mast@lysator.liu.se> + + * nnimap.el (nnimap-verify-uidvalidity): Fixed bug where uidvalidity + wasn't updated after mismatch. Clear cached mailbox info correctly + when uidvalidity changes. + (nnimap-group-prefixed-name): New function to avoid some code + duplication. + (nnimap-verify-uidvalidity, nnimap-group-overview-filename) + (nnimap-request-group): Use it. + (nnimap-retrieve-groups, nnimap-verify-uidvalidity) + (nnimap-update-unseen): Significantly improved speed of Gnus startup + with many imap folders. This is done by caching the group status from + the imap server persistently in a group parameter `imap-status'. (This + was cached before too if `nnimap-retrieve-groups-asynchronous' was set, + but not persistently, so every Gnus startup was still very slow.) + +2010-03-20 Teodor Zlatanov <tzz@lifelogs.com> + + * auth-source.el: Set up autoloads. Bump to 23.2 because of the + secrets.el dependency. + (auth-sources): Add optional user name. Add secrets.el configuration + choice (unused right now). + +2010-03-20 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-sum.el (gnus-summary-make-menu-bar): Let + `gnus-registry-install-shortcuts' fill in the functions. + + * gnus-registry.el (gnus-summary-misc-menu): Declare to avoid + warnings. + (gnus-registry-misc-menus): Variable to hold registry mark menus. + (gnus-registry-install-shortcuts): Populate and use it in a + `gnus-summary-menu-hook' lambda, under "Gnus"->"Registry Marks". + +2010-03-20 Martin Stjernholm <mast@lysator.liu.se> + + * nnimap.el (nnimap-decode-group-name, nnimap-encode-group-name): + In-place substitutions for the group name encoding/decoding. + (nnimap-find-minmax-uid, nnimap-possibly-change-group) + (nnimap-retrieve-headers-progress, nnimap-possibly-change-group) + (nnimap-retrieve-headers-progress, nnimap-request-article-part) + (nnimap-update-unseen, nnimap-request-list) + (nnimap-retrieve-groups, nnimap-request-update-info-internal) + (nnimap-request-set-mark, nnimap-split-to-groups) + (nnimap-split-articles, nnimap-request-newgroups) + (nnimap-request-create-group, nnimap-request-accept-article) + (nnimap-request-delete-group, nnimap-request-rename-group) + (nnimap-acl-get, nnimap-acl-edit): Use them. Replace `mbx' with + `encoded-mbx' for consistency. + (nnimap-close-group): Call `imap-current-mailbox' instead of using the + variable `imap-current-mailbox'. + + * gnus-agent.el (gnus-agent-fetch-articles, gnus-agent-fetch-headers) + (gnus-agent-regenerate-group): Use `gnus-agent-decoded-group-name'. + +2010-03-20 Bojan Petrovic <bpetrovi@f.bg.ac.rs> + + * pop3.el (pop3-display-message-size-flag): Display message size byte + counts during POP3 download. + (pop3-movemail): Use it. + (pop3-list): Implement listing of available messages. + +2010-03-20 Mark Triggs <mst@dishevelled.net> (tiny change) + + * nnir.el (nnir-get-article-nov-override-function): New function to + override the normal NOV retrieval. + (nnir-retrieve-headers): Use it. + 2010-03-19 Michael Albinus <michael.albinus@gmx.de> * auth-source.el (netrc-machine-user-or-password): Autoload.
--- a/lisp/gnus/auth-source.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/auth-source.el Fri Mar 26 15:03:20 2010 +0000 @@ -35,6 +35,9 @@ (eval-when-compile (require 'cl)) (autoload 'netrc-machine-user-or-password "netrc") +(autoload 'secrets-search-items "secrets") +(autoload 'secrets-get-alias "secrets") +(autoload 'secrets-get-attribute "secrets") (defgroup auth-source nil "Authentication sources." @@ -49,7 +52,7 @@ "List of authentication protocols and their names" :group 'auth-source - :version "23.1" ;; No Gnus + :version "23.2" ;; No Gnus :type '(repeat :tag "Authentication Protocols" (cons :tag "Protocol Entry" (symbol :tag "Protocol") @@ -71,7 +74,7 @@ (defcustom auth-source-do-cache t "Whether auth-source should cache information." :group 'auth-source - :version "23.1" ;; No Gnus + :version "23.2" ;; No Gnus :type `boolean) (defcustom auth-source-debug nil @@ -85,7 +88,7 @@ If the value is a function, debug messages are logged by calling that function using the same arguments as `message'." :group 'auth-source - :version "23.1" ;; No Gnus + :version "23.2" ;; No Gnus :type `(choice :tag "auth-source debugging mode" (const :tag "Log using `message' to the *Messages* buffer" t) @@ -96,19 +99,32 @@ "Whether auth-source should hide passwords in log messages. Only relevant if `auth-source-debug' is not nil." :group 'auth-source - :version "23.1" ;; No Gnus + :version "23.2" ;; No Gnus :type `boolean) (defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t)) "List of authentication sources. -Each entry is the authentication type with optional properties." +Each entry is the authentication type with optional properties. + +It's best to customize this with `M-x customize-variable' because the choices +can get pretty complex." :group 'auth-source - :version "23.1" ;; No Gnus + :version "23.2" ;; No Gnus :type `(repeat :tag "Authentication Sources" (list :tag "Source definition" (const :format "" :value :source) - (string :tag "Authentication Source") + (choice :tag "Authentication backend choice" + (string :tag "Authentication Source (file)") + (list :tag "secrets.el (Secret Service API/KWallet/GNOME KeyRing)" + (const :format "" :value :secrets) + (choice :tag "Collection to use" + (string :tag "Collection name") + (const :tag "Default" 'default) + (const :tag "Any" t) + (const :tag "Temporary" "session") + (string :tag "Specific session name") + (const :tag "Fallback" nil)))) (const :format "" :value :host) (choice :tag "Host (machine) choice" (const :tag "Any" t) @@ -118,7 +134,15 @@ (choice :tag "Protocol" (const :tag "Any" t) (const :tag "Fallback" nil) - ,@auth-source-protocols-customize)))) + ,@auth-source-protocols-customize) + (repeat :tag "Extra Parameters" :inline t + (choice :tag "Extra parameter" + (list :tag "Preferred username" :inline t + (const :format "" :value :preferred-username) + (choice :tag "Personality or username" + (const :tag "Any" t) + (const :tag "Fallback" nil) + (string :tag "Specific user name")))))))) ;; temp for debugging ;; (unintern 'auth-source-protocols)
--- a/lisp/gnus/gnus-agent.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/gnus-agent.el Fri Mar 26 15:03:20 2010 +0000 @@ -1583,7 +1583,8 @@ (setq selected-sets (nreverse selected-sets)) (gnus-make-directory dir) - (gnus-message 7 "Fetching articles for %s..." group) + (gnus-message 7 "Fetching articles for %s..." + (gnus-agent-decoded-group-name group)) (unwind-protect (while (setq articles (pop selected-sets)) @@ -1594,7 +1595,8 @@ (let (article) (while (setq article (pop articles)) (gnus-message 10 "Fetching article %s for %s..." - article group) + article + (gnus-agent-decoded-group-name group)) (when (or (gnus-backlog-request-article group article nntp-server-buffer) @@ -1942,7 +1944,8 @@ (if articles (progn - (gnus-message 7 "Fetching headers for %s..." group) + (gnus-message 7 "Fetching headers for %s..." + (gnus-agent-decoded-group-name group)) ;; Fetch them. (gnus-make-directory (nnheader-translate-file-chars @@ -3904,7 +3907,7 @@ (sit-for 1) t))))) (when group - (gnus-message 5 "Regenerating in %s" group) + (gnus-message 5 "Regenerating in %s" (gnus-agent-decoded-group-name group)) (let* ((gnus-command-method (or gnus-command-method (gnus-find-method-for-group group))) (file (gnus-agent-article-name ".overview" group)) @@ -3981,7 +3984,8 @@ (or (not nov-arts) (> (car downloaded) (car nov-arts)))) ;; This entry is missing from the overview file - (gnus-message 3 "Regenerating NOV %s %d..." group + (gnus-message 3 "Regenerating NOV %s %d..." + (gnus-agent-decoded-group-name group) (car downloaded)) (let ((file (concat dir (number-to-string (car downloaded))))) (mm-with-unibyte-buffer
--- a/lisp/gnus/gnus-art.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/gnus-art.el Fri Mar 26 15:03:20 2010 +0000 @@ -4192,6 +4192,8 @@ (put-text-property (match-end 0) (point-max) 'face eface))))))))) +(autoload 'canlock-verify "canlock" nil t) ;; for Emacs 21. + (defun article-verify-cancel-lock () "Verify Cancel-Lock header." (interactive)
--- a/lisp/gnus/gnus-registry.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/gnus-registry.el Fri Mar 26 15:03:20 2010 +0000 @@ -60,6 +60,7 @@ (require 'gnus-sum) (require 'gnus-util) (require 'nnmail) +(require 'easymenu) (defvar gnus-adaptive-word-syntax-table) @@ -137,6 +138,10 @@ (const :tag "Always Install" t) (const :tag "Ask Me" ask))) +(defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning. + +(defvar gnus-registry-misc-menus nil) ; ugly way to keep the menus + (defcustom gnus-registry-clean-empty t "Whether the empty registry entries should be deleted. Registry entries are considered empty when they have no groups @@ -764,7 +769,8 @@ "Install the keyboard shortcuts and menus for the registry. Uses `gnus-registry-marks' to find what shortcuts to install." (let (keys-plist) - (gnus-registry-do-marks + (setq gnus-registry-misc-menus nil) + (gnus-registry-do-marks :char (lambda (mark data) (let ((function-format @@ -813,19 +819,34 @@ ;; all this just to get the mark, I must be doing it wrong (intern ,(symbol-name mark)) articles ,remove t) + (gnus-message + 9 + "Applying mark %s to %d articles" + ,(symbol-name mark) (length articles)) (dolist (article articles) (gnus-summary-update-article - article + article (assoc article (gnus-data-list nil))))))) (push (intern function-name) keys-plist) - (push shortcut keys-plist) - (gnus-message + (push shortcut keys-plist) + (push (vector (format "%s %s" + (upcase-initials variant-name) + (symbol-name mark)) + (intern function-name) t) + gnus-registry-misc-menus) + (gnus-message 9 "Defined mark handling function %s" function-name)))))) (gnus-define-keys-1 - '(gnus-registry-mark-map "M" gnus-summary-mark-map) - keys-plist))) + '(gnus-registry-mark-map "M" gnus-summary-mark-map) + keys-plist) + (add-hook 'gnus-summary-menu-hook + (lambda () + (easy-menu-add-item + gnus-summary-misc-menu + nil + (cons "Registry Marks" gnus-registry-misc-menus)))))) ;;; use like this: ;;; (defalias 'gnus-user-format-function-M
--- a/lisp/gnus/gnus-sum.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/gnus-sum.el Fri Mar 26 15:03:20 2010 +0000 @@ -2635,17 +2635,6 @@ ["Set expirable mark" gnus-summary-mark-as-expirable t] ["Set bookmark" gnus-summary-set-bookmark t] ["Remove bookmark" gnus-summary-remove-bookmark t]) - ("Registry Mark" - ["Important" gnus-registry-set-article-Important-mark t] - ["Not Important" gnus-registry-remove-article-Important-mark t] - ["Work" gnus-registry-set-article-Work-mark t] - ["Not Work" gnus-registry-remove-article-Work-mark t] - ["Later" gnus-registry-set-article-Later-mark t] - ["Not Later" gnus-registry-remove-article-Later-mark t] - ["Personal" gnus-registry-set-article-Personal-mark t] - ["Not Personal" gnus-registry-remove-article-Personal-mark t] - ["To Do" gnus-registry-set-article-To-Do-mark t] - ["Not To Do" gnus-registry-remove-article-To-Do-mark t]) ("Limit to" ["Marks..." gnus-summary-limit-to-marks t] ["Subject..." gnus-summary-limit-to-subject t] @@ -2691,6 +2680,7 @@ gnus-newsgroup-process-stack] ["Save" gnus-summary-save-process-mark t] ["Run command on marked..." gnus-summary-universal-argument t])) + ("Registry Marks") ("Scroll article" ["Page forward" gnus-summary-next-page ,@(if (featurep 'xemacs) '(t)
--- a/lisp/gnus/mail-source.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/mail-source.el Fri Mar 26 15:03:20 2010 +0000 @@ -1,7 +1,7 @@ ;;; mail-source.el --- functions for fetching mail -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news, mail @@ -574,10 +574,13 @@ (error "Cannot get new mail")) 0))))))))) +(declare-function gnus-message "gnus-util" (level &rest args)) + (defun mail-source-delete-old-incoming (&optional age confirm) "Remove incoming files older than AGE days. If CONFIRM is non-nil, ask for confirmation before removing a file." (interactive "P") + (require 'gnus-util) (let* ((high2days (/ 65536.0 60 60 24));; convert high bits to days (low2days (/ 1.0 65536.0)) ;; convert low bits to days (diff (if (natnump age) age 30));; fallback, if no valid AGE given
--- a/lisp/gnus/message.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/message.el Fri Mar 26 15:03:20 2010 +0000 @@ -440,7 +440,7 @@ ;; Default to the value of `mail-interactive', available in all Emacsen ;; that Gnus supports. "Non-nil means when sending a message wait for and display errors. -nil means let mailer mail back a message to report errors." +A value of nil means let mailer mail back a message to report errors." :version "23.2" :group 'message-sending :group 'message-mail @@ -861,8 +861,8 @@ (defcustom message-qmail-inject-args nil "Arguments passed to qmail-inject programs. -This should be a list of strings, one string for each argument. It -may also be a function. +This should be a list of strings, one string for each argument. +It may also be a function. For e.g., if you wish to set the envelope sender address so that bounces go to the right place or to deal with listserv's usage of that address, you @@ -2850,6 +2850,8 @@ (inhibit-read-only t)) (remove-text-properties begin end message-forbidden-properties)))) +(autoload 'ecomplete-setup "ecomplete") ;; for Emacs <23. + ;;;###autoload (define-derived-mode message-mode text-mode "Message" "Major mode for editing mail and news to be sent. @@ -3252,7 +3254,7 @@ (defun message-kill-to-signature (&optional arg) "Kill all text up to the signature. -If a numberic argument or prefix arg is given, leave that number +If a numeric argument or prefix arg is given, leave that number of lines before the signature intact." (interactive "P") (save-excursion
--- a/lisp/gnus/mml-sec.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/mml-sec.el Fri Mar 26 15:03:20 2010 +0000 @@ -105,12 +105,18 @@ :group 'message :type 'boolean) -(defcustom mml-secure-cache-passphrase password-cache +(defcustom mml-secure-cache-passphrase + (if (boundp 'password-cache) + password-cache + t) "If t, cache passphrase." :group 'message :type 'boolean) -(defcustom mml-secure-passphrase-cache-expiry password-cache-expiry +(defcustom mml-secure-passphrase-cache-expiry + (if (boundp 'password-cache-expiry) + password-cache-expiry + 16) "How many seconds the passphrase is cached. Whether the passphrase is cached at all is controlled by `mml-secure-cache-passphrase'."
--- a/lisp/gnus/nnimap.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/nnimap.el Fri Mar 26 15:03:20 2010 +0000 @@ -501,6 +501,20 @@ ;; Utility functions: +(defsubst nnimap-decode-group-name (group) + (and group + (gnus-group-decoded-name group))) + +(defsubst nnimap-encode-group-name (group) + (and group + (mm-encode-coding-string group (gnus-group-name-charset nil group)))) + +(defun nnimap-group-prefixed-name (group &optional server) + (gnus-group-prefixed-name group + (gnus-server-to-method + (format "nnimap:%s" + (or server nnimap-current-server))))) + (defsubst nnimap-get-server-buffer (server) "Return buffer for SERVER, if nil use current server." (cadr (assoc (or server nnimap-current-server) nnimap-server-buffer-alist))) @@ -521,9 +535,7 @@ (defun nnimap-verify-uidvalidity (group server) "Verify stored uidvalidity match current one in GROUP on SERVER." - (let* ((gnusgroup (gnus-group-prefixed-name - group (gnus-server-to-method - (format "nnimap:%s" server)))) + (let* ((gnusgroup (nnimap-group-prefixed-name group server)) (new-uidvalidity (imap-mailbox-get 'uidvalidity)) (old-uidvalidity (gnus-group-get-parameter gnusgroup 'uidvalidity)) (dir (file-name-as-directory (expand-file-name nnimap-directory))) @@ -544,10 +556,18 @@ (if old-uidvalidity (if (not (equal old-uidvalidity new-uidvalidity)) ;; uidvalidity clash - (gnus-delete-file file) - (gnus-group-set-parameter gnusgroup 'uidvalidity new-uidvalidity) + (progn + (gnus-group-set-parameter gnusgroup 'uidvalidity new-uidvalidity) + (gnus-group-remove-parameter gnusgroup 'imap-status) + (gnus-sethash (gnus-group-prefixed-name group server) + nil nnimap-mailbox-info) + (gnus-delete-file file)) t) (gnus-group-add-parameter gnusgroup (cons 'uidvalidity new-uidvalidity)) + (gnus-group-remove-parameter gnusgroup 'imap-status) + (gnus-sethash ; Maybe not necessary here. + (gnus-group-prefixed-name group server) + nil nnimap-mailbox-info) t))) (defun nnimap-before-find-minmax-bugworkaround () @@ -563,36 +583,39 @@ "Find lowest and highest active article number in GROUP. If EXAMINE is non-nil the group is selected read-only." (with-current-buffer nnimap-server-buffer - (when (or (string= group (imap-current-mailbox)) - (imap-mailbox-select group examine)) - (let (minuid maxuid) - (when (> (imap-mailbox-get 'exists) 0) - (imap-fetch-safe '("1,*" . "1,*:*") "UID" nil 'nouidfetch) - (imap-message-map (lambda (uid Uid) - (setq minuid (if minuid (min minuid uid) uid) - maxuid (if maxuid (max maxuid uid) uid))) - 'UID)) - (list (imap-mailbox-get 'exists) minuid maxuid))))) + (let ((decoded-group (nnimap-decode-group-name group))) + (when (or (string= decoded-group (imap-current-mailbox)) + (imap-mailbox-select decoded-group examine)) + (let (minuid maxuid) + (when (> (imap-mailbox-get 'exists) 0) + (imap-fetch-safe '("1,*" . "1,*:*") "UID" nil 'nouidfetch) + (imap-message-map (lambda (uid Uid) + (setq minuid (if minuid (min minuid uid) uid) + maxuid (if maxuid (max maxuid uid) uid))) + 'UID)) + (list (imap-mailbox-get 'exists) minuid maxuid)))))) (defun nnimap-possibly-change-group (group &optional server) "Make GROUP the current group, and SERVER the current server." (when (nnimap-possibly-change-server server) - (with-current-buffer nnimap-server-buffer - (if (or (null group) (imap-current-mailbox-p group)) - imap-current-mailbox - (if (imap-mailbox-select group) - (if (or (nnimap-verify-uidvalidity - group (or server nnimap-current-server)) - (zerop (imap-mailbox-get 'exists group)) - t ;; for OGnus to see if ignoring uidvalidity - ;; changes has any bad effects. - (yes-or-no-p - (format - "nnimap: Group %s is not uidvalid. Continue? " group))) - imap-current-mailbox - (imap-mailbox-unselect) - (error "nnimap: Group %s is not uid-valid" group)) - (nnheader-report 'nnimap (imap-error-text))))))) + (let ((decoded-group (nnimap-decode-group-name group))) + (with-current-buffer nnimap-server-buffer + (if (or (null group) (imap-current-mailbox-p decoded-group)) + imap-current-mailbox ; Note: utf-7 encoded. + (if (imap-mailbox-select decoded-group) + (if (or (nnimap-verify-uidvalidity + group (or server nnimap-current-server)) + (zerop (imap-mailbox-get 'exists decoded-group)) + t ;; for OGnus to see if ignoring uidvalidity + ;; changes has any bad effects. + (yes-or-no-p + (format + "nnimap: Group %s is not uidvalid. Continue? " + decoded-group))) + imap-current-mailbox ; Note: utf-7 encoded. + (imap-mailbox-unselect) + (error "nnimap: Group %s is not uid-valid" decoded-group)) + (nnheader-report 'nnimap (imap-error-text)))))))) (defun nnimap-replace-whitespace (string) "Return STRING with all whitespace replaced with space." @@ -618,7 +641,7 @@ (let (headers lines chars uid mbx) (with-current-buffer nnimap-server-buffer (setq uid imap-current-message - mbx imap-current-mailbox + mbx (nnimap-encode-group-name (imap-current-mailbox)) headers (if (imap-capability 'IMAP4rev1) ;; xxx don't just use car? alist doesn't contain ;; anything else now, but it might... @@ -665,9 +688,7 @@ "Make file name for GROUP on SERVER." (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory))) (uidvalidity (gnus-group-get-parameter - (gnus-group-prefixed-name - group (gnus-server-to-method - (format "nnimap:%s" server))) + (nnimap-group-prefixed-name group server) 'uidvalidity)) (name (nnheader-translate-file-chars (concat nnimap-nov-file-name @@ -964,8 +985,10 @@ article))) (when article (gnus-message 10 "nnimap: Fetching (part of) article %d from %s..." - article (or group imap-current-mailbox - gnus-newsgroup-name)) + article (or (nnimap-decode-group-name group) + (imap-current-mailbox) + (nnimap-decode-group-name + gnus-newsgroup-name))) (if (not nnheader-callback-function) (with-current-buffer (or to-buffer nntp-server-buffer) (erase-buffer) @@ -979,11 +1002,15 @@ (nnheader-ms-strip-cr) (gnus-message 10 "nnimap: Fetching (part of) article %d from %s...done" - article (or group imap-current-mailbox gnus-newsgroup-name)) + article (or (nnimap-decode-group-name group) + (imap-current-mailbox) + (nnimap-decode-group-name gnus-newsgroup-name))) (if (bobp) (nnheader-report 'nnimap "No such article %d in %s: %s" - article (or group imap-current-mailbox - gnus-newsgroup-name) + article (or (nnimap-decode-group-name group) + (imap-current-mailbox) + (nnimap-decode-group-name + gnus-newsgroup-name)) (imap-error-text nnimap-server-buffer)) (cons group article))) (add-hook 'imap-fetch-data-hook @@ -1020,8 +1047,7 @@ (deffoo nnimap-request-group (group &optional server fast) (nnimap-request-update-info-internal group - (gnus-get-info (gnus-group-prefixed-name - group (gnus-server-to-method (format "nnimap:%s" server)))) + (gnus-get-info (nnimap-group-prefixed-name group server)) server) (when (nnimap-possibly-change-group group server) (nnimap-before-find-minmax-bugworkaround) @@ -1044,8 +1070,8 @@ (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server) nnimap-mailbox-info))) (list (nth 0 old) (nth 1 old) - (imap-mailbox-status group 'unseen nnimap-server-buffer) - (nth 3 old))) + (imap-mailbox-status (nnimap-decode-group-name group) + 'unseen nnimap-server-buffer))) nnimap-mailbox-info)) (defun nnimap-close-group (group &optional server) @@ -1060,7 +1086,7 @@ (imap-mailbox-close nnimap-close-asynchronous)))) (ask (if (and (imap-search "DELETED") (gnus-y-or-n-p (format "Expunge articles in group `%s'? " - imap-current-mailbox))) + (imap-current-mailbox)))) (progn (imap-mailbox-expunge nnimap-close-asynchronous) (unless nnimap-dont-close @@ -1089,11 +1115,12 @@ (dolist (mbx (funcall nnimap-request-list-method (cdr pattern) (car pattern))) (or (member "\\NoSelect" (imap-mailbox-get 'list-flags mbx)) - (let ((info (nnimap-find-minmax-uid mbx 'examine))) + (let* ((encoded-mbx (nnimap-encode-group-name mbx)) + (info (nnimap-find-minmax-uid encoded-mbx 'examine))) (when info (with-current-buffer nntp-server-buffer (insert (format "\"%s\" %d %d y\n" - mbx (or (nth 2 info) 0) + encoded-mbx (or (nth 2 info) 0) (max 1 (or (nth 1 info) 1))))))))))) (gnus-message 5 "nnimap: Generating active list%s...done" (if (> (length server) 0) (concat " for " server) "")) @@ -1143,73 +1170,88 @@ (with-current-buffer nntp-server-buffer (erase-buffer) (nnimap-before-find-minmax-bugworkaround) - (let (asyncgroups slowgroups) + (let (asyncgroups slowgroups decoded-group) (if (null nnimap-retrieve-groups-asynchronous) (setq slowgroups groups) (dolist (group groups) - (gnus-message 9 "nnimap: Quickly checking mailbox %s" group) - (add-to-list (if (gnus-gethash-safe - (gnus-group-prefixed-name group server) - nnimap-mailbox-info) + (setq decoded-group (nnimap-decode-group-name group)) + (gnus-message 9 "nnimap: Quickly checking mailbox %s" + decoded-group) + (add-to-list (if (gnus-group-get-parameter + (nnimap-group-prefixed-name group) + 'imap-status) 'asyncgroups 'slowgroups) (list group (imap-mailbox-status-asynch - group '(uidvalidity uidnext unseen) + decoded-group + '(uidvalidity uidnext unseen) nnimap-server-buffer)))) (dolist (asyncgroup asyncgroups) - (let ((group (nth 0 asyncgroup)) - (tag (nth 1 asyncgroup)) - new old) + (let* ((group (nth 0 asyncgroup)) + (tag (nth 1 asyncgroup)) + (gnusgroup (nnimap-group-prefixed-name group)) + (saved-uidvalidity (gnus-group-get-parameter gnusgroup + 'uidvalidity)) + (saved-imap-status (gnus-group-get-parameter gnusgroup + 'imap-status)) + (saved-info (and saved-imap-status + (split-string saved-imap-status " ")))) + (setq decoded-group (nnimap-decode-group-name group)) (when (imap-ok-p (imap-wait-for-tag tag nnimap-server-buffer)) - (if (or (not (string= - (nth 0 (gnus-gethash (gnus-group-prefixed-name - group server) - nnimap-mailbox-info)) - (imap-mailbox-get 'uidvalidity group + (if (or (not (equal + saved-uidvalidity + (imap-mailbox-get 'uidvalidity decoded-group nnimap-server-buffer))) - (not (string= - (nth 1 (gnus-gethash (gnus-group-prefixed-name - group server) - nnimap-mailbox-info)) - (imap-mailbox-get 'uidnext group + (not (equal + (nth 0 saved-info) + (imap-mailbox-get 'uidnext decoded-group nnimap-server-buffer)))) (push (list group) slowgroups) - (insert (nth 3 (gnus-gethash (gnus-group-prefixed-name - group server) - nnimap-mailbox-info)))))))) + (gnus-sethash + (gnus-group-prefixed-name group server) + (list (imap-mailbox-get 'uidvalidity + decoded-group nnimap-server-buffer) + (imap-mailbox-get 'uidnext + decoded-group nnimap-server-buffer) + (imap-mailbox-get 'unseen + decoded-group nnimap-server-buffer)) + nnimap-mailbox-info) + (insert (format "\"%s\" %s %s y\n" group + (nth 2 saved-info) + (nth 1 saved-info)))))))) (dolist (group slowgroups) (if nnimap-retrieve-groups-asynchronous (setq group (car group))) - (gnus-message 7 "nnimap: Mailbox %s modified" group) - (imap-mailbox-put 'uidnext nil group nnimap-server-buffer) - (or (member "\\NoSelect" (imap-mailbox-get 'list-flags group + (setq decoded-group (nnimap-decode-group-name group)) + (gnus-message 7 "nnimap: Mailbox %s modified" decoded-group) + (or (member "\\NoSelect" (imap-mailbox-get 'list-flags decoded-group nnimap-server-buffer)) - (let* ((info (nnimap-find-minmax-uid group 'examine)) - (str (format "\"%s\" %d %d y\n" group - (or (nth 2 info) 0) - (max 1 (or (nth 1 info) 1))))) - (when (> (or (imap-mailbox-get 'recent group + (let* ((gnusgroup (nnimap-group-prefixed-name group)) + (status (imap-mailbox-status + decoded-group '(uidvalidity uidnext unseen) + nnimap-server-buffer)) + (info (nnimap-find-minmax-uid group 'examine)) + (min-uid (max 1 (or (nth 1 info) 1))) + (max-uid (or (nth 2 info) 0))) + (when (> (or (imap-mailbox-get 'recent decoded-group nnimap-server-buffer) 0) 0) - (push (list (cons group 0)) nnmail-split-history)) - (insert str) - (when nnimap-retrieve-groups-asynchronous - (gnus-sethash - (gnus-group-prefixed-name group server) - (list (or (imap-mailbox-get - 'uidvalidity group nnimap-server-buffer) - (imap-mailbox-status - group 'uidvalidity nnimap-server-buffer)) - (or (imap-mailbox-get - 'uidnext group nnimap-server-buffer) - (imap-mailbox-status - group 'uidnext nnimap-server-buffer)) - (or (imap-mailbox-get - 'unseen group nnimap-server-buffer) - (imap-mailbox-status - group 'unseen nnimap-server-buffer)) - str) - nnimap-mailbox-info))))))) + (push (list (cons decoded-group 0)) nnmail-split-history)) + (insert (format "\"%s\" %d %d y\n" group max-uid min-uid)) + (gnus-sethash + (gnus-group-prefixed-name group server) + status + nnimap-mailbox-info) + (if (not (equal (nth 0 status) + (gnus-group-get-parameter gnusgroup + 'uidvalidity))) + (nnimap-verify-uidvalidity group nnimap-current-server)) + ;; The imap-status parameter is a string on the form + ;; "<uidnext> <min-uid> <max-uid>". + (gnus-group-add-parameter + gnusgroup + (cons 'imap-status + (format "%s %s %s" (nth 1 status) min-uid max-uid)))))))) (gnus-message 5 "nnimap: Checking mailboxes...done") 'active)) @@ -1218,7 +1260,7 @@ (when info ;; xxx what does this mean? should we create a info? (with-current-buffer nnimap-server-buffer (gnus-message 5 "nnimap: Updating info for %s..." - (gnus-info-group info)) + (nnimap-decode-group-name (gnus-info-group info))) (when (nnimap-mark-permanent-p 'read) (let (seen unseen) @@ -1264,7 +1306,7 @@ t)) (gnus-message 5 "nnimap: Updating info for %s...done" - (gnus-info-group info)) + (nnimap-decode-group-name (gnus-info-group info))) info)))) @@ -1277,7 +1319,8 @@ (when (nnimap-possibly-change-group group server) (with-current-buffer nnimap-server-buffer (let (action) - (gnus-message 7 "nnimap: Setting marks in %s..." group) + (gnus-message 7 "nnimap: Setting marks in %s..." + (nnimap-decode-group-name group)) (while (setq action (pop actions)) (let ((range (nth 0 action)) (what (nth 1 action)) @@ -1318,7 +1361,8 @@ (imap-message-flags-set (imap-range-to-message-set range) (nnimap-mark-to-flag marks nil t))))))) - (gnus-message 7 "nnimap: Setting marks in %s...done" group)))) + (gnus-message 7 "nnimap: Setting marks in %s...done" + (nnimap-decode-group-name group))))) nil) (defun nnimap-split-fancy () @@ -1329,6 +1373,7 @@ (defun nnimap-split-to-groups (rules) ;; tries to match all rules in nnimap-split-rule against content of ;; nntp-server-buffer, returns a list of groups that matched. + ;; Note: This function takes and returns decoded group names. (with-current-buffer nntp-server-buffer ;; Fold continuation lines. (goto-char (point-min)) @@ -1381,12 +1426,16 @@ (list nnimap-split-inbox))) (defun nnimap-split-articles (&optional group server) + ;; Note: Assumes decoded group names in nnimap-split-inbox, + ;; nnimap-split-rule, nnimap-split-fancy, and nnmail-split-history. (when (nnimap-possibly-change-server server) (with-current-buffer nnimap-server-buffer - (let (rule inbox removeorig (inboxes (nnimap-split-find-inbox server))) + (let (rule inbox removeorig + (inboxes (nnimap-split-find-inbox server))) ;; iterate over inboxes (while (and (setq inbox (pop inboxes)) - (nnimap-possibly-change-group inbox)) ;; SELECT + (nnimap-possibly-change-group + (nnimap-encode-group-name inbox))) ;; SELECT ;; find split rule for this server / inbox (when (setq rule (nnimap-split-find-rule server inbox)) ;; iterate over articles @@ -1415,7 +1464,7 @@ (and (setq msgid (nnmail-fetch-field "message-id")) (nnmail-cache-insert msgid - to-group + (nnimap-encode-group-name to-group) (nnmail-fetch-field "subject")))))) ;; Add the group-art list to the history list. (push (list (cons to-group 0)) nnmail-split-history)) @@ -1458,10 +1507,11 @@ (if (string= (downcase mailbox) "\\noselect") (throw 'found t))) nil) - (let ((info (nnimap-find-minmax-uid mbx 'examine))) + (let* ((encoded-mbx (nnimap-encode-group-name mbx)) + (info (nnimap-find-minmax-uid encoded-mbx 'examine))) (when info (insert (format "\"%s\" %d %d y\n" - mbx (or (nth 2 info) 0) + encoded-mbx (or (nth 2 info) 0) (max 1 (or (nth 1 info) 1))))))))) (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done" (if (> (length server) 0) " on " "") server)) @@ -1469,10 +1519,11 @@ (deffoo nnimap-request-create-group (group &optional server args) (when (nnimap-possibly-change-server server) - (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer) - (imap-mailbox-create group nnimap-server-buffer) - (nnheader-report 'nnimap "%S" - (imap-error-text nnimap-server-buffer))))) + (let ((decoded-group (nnimap-decode-group-name group))) + (or (imap-mailbox-status decoded-group 'uidvalidity nnimap-server-buffer) + (imap-mailbox-create decoded-group nnimap-server-buffer) + (nnheader-report 'nnimap "%S" + (imap-error-text nnimap-server-buffer)))))) (defun nnimap-time-substract (time1 time2) "Return TIME for TIME1 - TIME2." @@ -1603,7 +1654,8 @@ nnimap-current-move-group) (imap-message-copy (number-to-string nnimap-current-move-article) - group 'dontcreate nil + (nnimap-decode-group-name group) + 'dontcreate nil nnimap-server-buffer)) (with-current-buffer (current-buffer) (goto-char (point-min)) @@ -1623,13 +1675,15 @@ ;; this 'or' is for Cyrus server bug (or (null (imap-current-mailbox nnimap-server-buffer)) (imap-mailbox-unselect nnimap-server-buffer)) - (imap-message-append group (current-buffer) nil nil + (imap-message-append (nnimap-decode-group-name group) + (current-buffer) nil nil nnimap-server-buffer))) (cons group (nth 1 uid)) (nnheader-report 'nnimap (imap-error-text nnimap-server-buffer)))))) (deffoo nnimap-request-delete-group (group force &optional server) (when (nnimap-possibly-change-server server) + (setq group (nnimap-decode-group-name group)) (when (string= group (imap-current-mailbox nnimap-server-buffer)) (imap-mailbox-unselect nnimap-server-buffer)) (with-current-buffer nnimap-server-buffer @@ -1641,7 +1695,9 @@ (deffoo nnimap-request-rename-group (group new-name &optional server) (when (nnimap-possibly-change-server server) - (imap-mailbox-rename group new-name nnimap-server-buffer))) + (imap-mailbox-rename (nnimap-decode-group-name group) + (nnimap-decode-group-name new-name) + nnimap-server-buffer))) (defun nnimap-expunge (mailbox server) (when (nnimap-possibly-change-group mailbox server) @@ -1650,7 +1706,8 @@ (defun nnimap-acl-get (mailbox server) (when (nnimap-possibly-change-server server) (and (imap-capability 'ACL nnimap-server-buffer) - (imap-mailbox-acl-get mailbox nnimap-server-buffer)))) + (imap-mailbox-acl-get (nnimap-decode-group-name mailbox) + nnimap-server-buffer)))) (defun nnimap-acl-edit (mailbox method old-acls new-acls) (when (nnimap-possibly-change-server (cadr method)) @@ -1660,7 +1717,8 @@ ;; delete all removed identifiers (mapc (lambda (old-acl) (unless (assoc (car old-acl) new-acls) - (or (imap-mailbox-acl-delete (car old-acl) mailbox) + (or (imap-mailbox-acl-delete (car old-acl) + (nnimap-decode-group-name mailbox)) (error "Can't delete ACL for %s" (car old-acl))))) old-acls) ;; set all changed acl's @@ -1669,7 +1727,8 @@ (old-rights (cdr (assoc (car new-acl) old-acls)))) (unless (and old-rights new-rights (string= old-rights new-rights)) - (or (imap-mailbox-acl-set (car new-acl) new-rights mailbox) + (or (imap-mailbox-acl-set (car new-acl) new-rights + (nnimap-decode-group-name mailbox)) (error "Can't set ACL for %s to %s" (car new-acl) new-rights))))) new-acls)
--- a/lisp/gnus/nnir.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/nnir.el Fri Mar 26 15:03:20 2010 +0000 @@ -358,6 +358,14 @@ (defvar nnir-imap-search-argument-history () "The history for querying search options in nnir") +(defvar nnir-get-article-nov-override-function nil + "If non-nil, a function that will be passed each search result. This +should return a message's headers in NOV format. + +If this variable is nil, or if the provided function returns nil for a search +result, `gnus-retrieve-headers' will be called instead.") + + ;;; Developer Extension Variable: (defvar nnir-engines @@ -779,25 +787,31 @@ (nnir-possibly-change-server server) (let ((gnus-override-method (gnus-server-to-method server))) - (case (setq foo (gnus-retrieve-headers (list artno) artfullgroup nil)) - (nov - (goto-char (point-min)) - (setq novitem (nnheader-parse-nov)) - (unless novitem - (pop-to-buffer nntp-server-buffer) - (error - "nnheader-parse-nov returned nil for article %s in group %s" - artno artfullgroup))) - (headers - (goto-char (point-min)) - (setq novitem (nnheader-parse-head)) - (unless novitem - (pop-to-buffer nntp-server-buffer) - (error - "nnheader-parse-head returned nil for article %s in group %s" - artno artfullgroup))) - (t (error "Unknown header type %s while requesting article %s of group %s" - foo artno artfullgroup)))) + ;; if nnir-get-article-nov-override-function is set, use it + (if nnir-get-article-nov-override-function + (setq novitem (funcall nnir-get-article-nov-override-function + artitem)) + ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head + (case (setq foo (gnus-retrieve-headers (list artno) + artfullgroup nil)) + (nov + (goto-char (point-min)) + (setq novitem (nnheader-parse-nov)) + (unless novitem + (pop-to-buffer nntp-server-buffer) + (error + "nnheader-parse-nov returned nil for article %s in group %s" + artno artfullgroup))) + (headers + (goto-char (point-min)) + (setq novitem (nnheader-parse-head)) + (unless novitem + (pop-to-buffer nntp-server-buffer) + (error + "nnheader-parse-head returned nil for article %s in group %s" + artno artfullgroup))) + (t (error "Unknown header type %s while requesting article %s of group %s" + foo artno artfullgroup))))) ;; replace article number in original group with article number ;; in nnir group (mail-header-set-number novitem art)
--- a/lisp/gnus/pop3.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/pop3.el Fri Mar 26 15:03:20 2010 +0000 @@ -98,6 +98,12 @@ :type 'boolean :group 'pop3) +(defcustom pop3-display-message-size-flag t + "*If non-nil, display the size of the message that is being fetched." + :version "22.1" ;; Oort Gnus + :type 'boolean + :group 'pop3) + (defvar pop3-timestamp nil "Timestamp returned when initially connected to the POP server. Used for APOP authentication.") @@ -135,6 +141,7 @@ (crashbuf (get-buffer-create " *pop3-retr*")) (n 1) message-count + message-sizes (pop3-password pop3-password)) ;; for debugging only (if pop3-debug (switch-to-buffer (process-buffer process))) @@ -149,10 +156,18 @@ (pop3-pass process)) (t (error "Invalid POP3 authentication scheme"))) (setq message-count (car (pop3-stat process))) + (when (and pop3-display-message-size-flag + (> message-count 0)) + (setq message-sizes (pop3-list process))) (unwind-protect (while (<= n message-count) - (message "Retrieving message %d of %d from %s..." - n message-count pop3-mailhost) + (if pop3-display-message-size-flag + (message "Retrieving message %d of %d from %s... (%.1fk)" + n message-count pop3-mailhost + (/ (cdr (assoc n message-sizes)) + 1024.0)) + (message "Retrieving message %d of %d from %s..." + n message-count pop3-mailhost)) (pop3-retr process n crashbuf) (save-excursion (set-buffer crashbuf) @@ -451,8 +466,28 @@ )) (defun pop3-list (process &optional msg) - "Scan listing of available messages. -This function currently does nothing.") + "If MSG is nil, return an alist of (MESSAGE-ID . SIZE) pairs. +Otherwise, return the size of the message-id MSG" + (pop3-send-command process (if msg + (format "LIST %d" msg) + "LIST")) + (let ((response (pop3-read-response process t))) + (if msg + (string-to-number (nth 2 (split-string response " "))) + (let ((start pop3-read-point) end) + (save-excursion + (set-buffer (process-buffer process)) + (while (not (re-search-forward "^\\.\r\n" nil t)) + (pop3-accept-process-output process) + (goto-char start)) + (setq pop3-read-point (point-marker)) + (goto-char (match-beginning 0)) + (setq end (point-marker)) + (mapcar #'(lambda (s) (let ((split (split-string s " "))) + (cons (string-to-number (nth 0 split)) + (string-to-number (nth 1 split))))) + (delete "" (split-string (buffer-substring start end) + "\r\n")))))))) (defun pop3-retr (process msg crashbuf) "Retrieve message-id MSG to buffer CRASHBUF."
--- a/lisp/gnus/smiley.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/gnus/smiley.el Fri Mar 26 15:03:20 2010 +0000 @@ -196,8 +196,8 @@ ;;;###autoload (defun smiley-buffer (&optional buffer) - "Run `smiley-region' at the buffer, specified in the argument or -interactively. If there's no argument, do it at the current buffer" + "Run `smiley-region' at the BUFFER, specified in the argument or +interactively. If there's no argument, do it at the current buffer." (interactive "bBuffer to run smiley-region: ") (save-excursion (if buffer
--- a/lisp/image-dired.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/image-dired.el Fri Mar 26 15:03:20 2010 +0000 @@ -801,7 +801,7 @@ With optional argument APPEND, append thumbnail to thumbnail buffer instead of erasing it first. -Option argument DO-NOT-POP controls if `pop-to-buffer' should be +Optional argument DO-NOT-POP controls if `pop-to-buffer' should be used or not. If non-nil, use `display-buffer' instead of `pop-to-buffer'. This is used from functions like `image-dired-next-line-and-display' and @@ -2113,8 +2113,7 @@ (defun image-dired-read-comment (&optional file) "Read comment for an image. -Read comment for an image, optionally using old comment from FILE -as initial value." +Optionally use old comment from FILE as initial value." (let ((comment (read-string "Comment: "
--- a/lisp/indent.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/indent.el Fri Mar 26 15:03:20 2010 +0000 @@ -85,8 +85,10 @@ (defun indent-for-tab-command (&optional arg) "Indent line or region in proper way for current major mode or insert a tab. Depending on `tab-always-indent', either insert a tab or indent. -If initial point was within line's indentation, position after -the indentation. Else stay at same point in text. + +In most major modes, if point was in the current line's indentation, +it is moved to the first non-whitespace character after indenting; +otherwise it stays at the same position in the text. If a prefix argument is given, also rigidly indent the entire balanced expression which starts at the beginning of the current
--- a/lisp/info.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/info.el Fri Mar 26 15:03:20 2010 +0000 @@ -3362,7 +3362,8 @@ (insert (format "* %-14s %s.\n" (concat (symbol-name keyword) "::") (cdr assoc))))) - (cons '(unknown . "unknown keywords") + (append '((all . "All package info") + (unknown . "unknown keywords")) finder-known-keywords))) ((equal nodename "unknown") ;; Display unknown keywords @@ -3377,6 +3378,22 @@ (concat (symbol-name (car assoc)) "::") (cdr assoc)))) (finder-unknown-keywords))) + ((equal nodename "all") + ;; Display all package info. + (insert (format "\n\^_\nFile: %s, Node: %s, Up: Top\n\n" + Info-finder-file nodename)) + (insert "Finder Package Info\n") + (insert "*******************\n\n") + (mapc (lambda (package) + (insert (format "%s - %s\n" + (format "*Note %s::" (nth 0 package)) + (nth 1 package))) + (insert "Keywords: " + (mapconcat (lambda (keyword) + (format "*Note %s::" (symbol-name keyword))) + (nth 2 package) ", ") + "\n\n")) + finder-package-info)) ((string-match-p "\\.el\\'" nodename) ;; Display commentary section (insert (format "\n\^_\nFile: %s, Node: %s, Up: Top\n\n" @@ -3401,6 +3418,7 @@ (buffer-string)))))) (t ;; Display packages that match the keyword + ;; or the list of keywords separated by comma. (insert (format "\n\^_\nFile: %s, Node: %s, Up: Top\n\n" Info-finder-file nodename)) (insert "Finder Packages\n") @@ -3408,21 +3426,39 @@ (insert "The following packages match the keyword `" nodename "':\n\n") (insert "* Menu:\n\n") - (let ((id (intern nodename))) + (let ((keywords + (mapcar 'intern (if (string-match-p "," nodename) + (split-string nodename ",[ \t\n]*" t) + (list nodename))))) (mapc - (lambda (x) - (when (memq id (cadr (cdr x))) + (lambda (package) + (unless (memq nil (mapcar (lambda (k) (memq k (nth 2 package))) + keywords)) (insert (format "* %-16s %s.\n" - (concat (car x) "::") - (cadr x))))) + (concat (nth 0 package) "::") + (nth 1 package))))) finder-package-info))))) ;;;###autoload -(defun info-finder () - "Display descriptions of the keywords in the Finder virtual manual." - (interactive) +(defun info-finder (&optional keywords) + "Display descriptions of the keywords in the Finder virtual manual. +In interactive use, a prefix argument directs this command to read +a list of keywords separated by comma. After that, it displays a node +with a list packages that contain all specified keywords." + (interactive + (when current-prefix-arg + (require 'finder) + (list + (completing-read-multiple + "Keywords (separated by comma): " + (mapcar 'symbol-name (mapcar 'car (append finder-known-keywords + (finder-unknown-keywords)))) + nil t)))) (require 'finder) - (Info-find-node Info-finder-file "Top")) + (if keywords + (Info-find-node Info-finder-file (mapconcat 'identity keywords ", ")) + (Info-find-node Info-finder-file "Top"))) + (defun Info-undefined () "Make command be undefined in Info."
--- a/lisp/json.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/json.el Fri Mar 26 15:03:20 2010 +0000 @@ -62,12 +62,12 @@ (defvar json-object-type 'alist "Type to convert JSON objects to. -Must be one of `alist', `plist', or `hash-table'. Consider let-binding +Must be one of `alist', `plist', or `hash-table'. Consider let-binding this around your call to `json-read' instead of `setq'ing it.") (defvar json-array-type 'vector "Type to convert JSON arrays to. -Must be one of `vector' or `list'. Consider let-binding this around +Must be one of `vector' or `list'. Consider let-binding this around your call to `json-read' instead of `setq'ing it.") (defvar json-key-type nil @@ -83,19 +83,19 @@ `plist' `keyword' Note that values other than `string' might behave strangely for -Sufficiently Weird keys. Consider let-binding this around your call to +Sufficiently Weird keys. Consider let-binding this around your call to `json-read' instead of `setq'ing it.") (defvar json-false :json-false "Value to use when reading JSON `false'. If this has the same value as `json-null', you might not be able to tell -the difference between `false' and `null'. Consider let-binding this +the difference between `false' and `null'. Consider let-binding this around your call to `json-read' instead of `setq'ing it.") (defvar json-null nil "Value to use when reading JSON `null'. If this has the same value as `json-false', you might not be able to -tell the difference between `false' and `null'. Consider let-binding +tell the difference between `false' and `null'. Consider let-binding this around your call to `json-read' instead of `setq'ing it.") @@ -218,7 +218,7 @@ (defun json-read-number (&optional sign) "Read the JSON number following point. -The optional SIGN argument is for internal use. +The optional SIGN argument is for internal use. N.B.: Only numbers which can fit in Emacs Lisp's native number representation will be parsed correctly."
--- a/lisp/language/indian.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/language/indian.el Fri Mar 26 15:03:20 2010 +0000 @@ -141,7 +141,7 @@ (defconst devanagari-composable-pattern (let ((table '(("V" . "[\u0904-\u0914\u0960-\u0961\u0972]") ; independent vowel - ("C" . "[\u0915-\u0939]") ; consonant + ("C" . "[\u0915-\u0939\u0958-\u095F\u097B-\u097C\u097E-\u097F]") ; consonant ("R" . "\u0930") ; RA ("n" . "\u093C") ; NUKTA ("H" . "\u094D") ; HALANT
--- a/lisp/log-edit.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/log-edit.el Fri Mar 26 15:03:20 2010 +0000 @@ -191,22 +191,20 @@ (defvar log-edit-extra-flags nil "List of extra flags to pass to the check in command.") (defvar log-edit-before-checkin-process nil - "Alist that contains instructions for processing the commit message before check in. - + "Alist with instructions for processing the commit message before check in. The format is: (REGEXP . INSTRUCTIONS). +All lines matching REGEXP are removed. For example: -All lines matching REGEXP are removed. +\(\"^#.*\" . nil) -For example: - -(\"^#.*\" . nil) means: just remove all lines starting with #. This can be used to insert lines in the commit buffer that contain, for example, the list of files to be committed. -(\"Author: \\(.*\\)\" . (list \"--author\" (match-string 1))) -means: append (list \"--author\" (match-string 1)) to -`log-edit-extra-flags'.") +\(\"Author: \\\\(.*\\\\)\" . (list \"--author\" (match-string 1))) + +means: append (list \"--author\" (match-string 1)) to `log-edit-extra-flags'.") + (defvar log-edit-parent-buffer nil) ;;; Originally taken from VC-Log mode
--- a/lisp/mail/rmail.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/mail/rmail.el Fri Mar 26 15:03:20 2010 +0000 @@ -381,6 +381,20 @@ :group 'rmail-headers :version "22.1") +;; This was removed in Emacs 23.1 with no notification, an unnecessary +;; incompatible change. +(defcustom rmail-highlight-face 'rmail-highlight + "Face used by Rmail for highlighting headers." + ;; Note that nil doesn't actually mean use the default face, it + ;; means use either bold or highlight. It's not worth fixing this + ;; now that this is obsolete. + :type '(choice (const :tag "Default" nil) + face) + :group 'rmail-headers) +(make-obsolete-variable 'rmail-highlight-face + "customize the face `rmail-highlight' instead." + "23.2") + (defface rmail-header-name '((t (:inherit font-lock-function-name-face))) "Face to use for highlighting the header names. @@ -2883,7 +2897,7 @@ (defun rmail-highlight-headers () "Highlight the headers specified by `rmail-highlighted-headers'. -Uses the face `rmail-highlight'." +Uses the face specified by `rmail-highlight-face'." (if rmail-highlighted-headers (save-excursion (search-forward "\n\n" nil 'move) @@ -2891,6 +2905,11 @@ (narrow-to-region (point-min) (point)) (let ((case-fold-search t) (inhibit-read-only t) + ;; When rmail-highlight-face is removed, just + ;; use 'rmail-highlight here. + (face (or rmail-highlight-face + (if (face-differs-from-default-p 'bold) + 'bold 'highlight))) ;; List of overlays to reuse. (overlays rmail-overlay-list)) (goto-char (point-min)) @@ -2909,12 +2928,12 @@ (progn (setq overlay (car overlays) overlays (cdr overlays)) - (overlay-put overlay 'face 'rmail-highlight) + (overlay-put overlay 'face face) (move-overlay overlay beg (point))) ;; Make a new overlay and add it to ;; rmail-overlay-list. (setq overlay (make-overlay beg (point))) - (overlay-put overlay 'face 'rmail-highlight) + (overlay-put overlay 'face face) (setq rmail-overlay-list (cons overlay rmail-overlay-list))))))))))
--- a/lisp/mh-e/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/mh-e/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,15 @@ +2010-03-24 Juanma Barranquero <lekktu@gmail.com> + + * mh-scan.el (mh-scan-cmd-note-width): Doc fix. + (mh-scan-format-mh, mh-scan-body-regexp, mh-scan-cur-msg-number-regexp) + (mh-scan-cur-msg-number-regexp, mh-scan-date-regexp) + (mh-scan-deleted-msg-regexp, mh-scan-good-msg-regexp) + (mh-scan-msg-format-regexp, mh-scan-msg-format-string) + (mh-scan-msg-number-regexp, mh-scan-rcpt-regexp) + (mh-scan-refiled-msg-regexp, mh-scan-sent-to-me-sender-regexp) + (mh-scan-subject-regexp, mh-update-scan-format) + (mh-msg-num-width-to-column): Fix typos in docstrings. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.
--- a/lisp/mh-e/mh-scan.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/mh-e/mh-scan.el Fri Mar 26 15:03:20 2010 +0000 @@ -61,7 +61,7 @@ "%{subject}%<{body}<<%{body}%>") "*Scan format string for MH. This string is passed to the scan program via the -format -argument. This format is identical to the default except that +argument. This format is identical to the default except that additional hints for fontification have been added to the fifth column (remember that in Emacs, the first column is 0). @@ -109,14 +109,14 @@ Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least one parenthesized expression which matches the body text as in the default of -\"\\\\(<<\\\\([^\\n]+\\\\)?\\\\)\". If this regular expression is +\"\\\\(<<\\\\([^\\n]+\\\\)?\\\\)\". If this regular expression is not correct, the body fragment will not be highlighted with the face `mh-folder-body'.") (defvar mh-scan-cur-msg-number-regexp "^\\( *[0-9]+\\+\\).*" "This regular expression matches the current message. -It must match from the beginning of the line. Note that the +It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least one parenthesized expression which matches the message number as in the default of @@ -125,9 +125,9 @@ This expression includes the leading space and current message marker \"+\" within the parenthesis since it looks better to -highlight these items as well. The highlighting is done with the -face `mh-folder-cur-msg-number'. This regular expression should -be correct as it is needed by non-fontification functions. See +highlight these items as well. The highlighting is done with the +face `mh-folder-cur-msg-number'. This regular expression should +be correct as it is needed by non-fontification functions. See also `mh-note-cur'.") (defvar mh-scan-date-regexp "\\([0-9][0-9]/[0-9][0-9]\\)" @@ -137,14 +137,14 @@ Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain only one parenthesized expression which matches the date field as in the default of -\"\\\\([0-9][0-9]/[0-9][0-9]\\\\)\"}. If this regular expression +\"\\\\([0-9][0-9]/[0-9][0-9]\\\\)\"}. If this regular expression is not correct, the date will not be highlighted with the face `mh-folder-date'.") (defvar mh-scan-deleted-msg-regexp "^\\( *[0-9]+\\)D" "This regular expression matches deleted messages. -It must match from the beginning of the line. Note that the +It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least one parenthesized expression which matches the message number as in the default of @@ -152,15 +152,15 @@ \"^\\\\( *[0-9]+\\\\)D\". This expression includes the leading space within the parenthesis -since it looks better to highlight it as well. The highlighting -is done with the face `mh-folder-deleted'. This regular +since it looks better to highlight it as well. The highlighting +is done with the face `mh-folder-deleted'. This regular expression should be correct as it is needed by non-fontification -functions. See also `mh-note-deleted'.") +functions. See also `mh-note-deleted'.") (defvar mh-scan-good-msg-regexp "^\\( *[0-9]+\\)[^D^0-9]" "This regular expression matches \"good\" messages. -It must match from the beginning of the line. Note that the +It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least one parenthesized expression which matches the message number as in the default of @@ -168,8 +168,8 @@ \"^\\\\( *[0-9]+\\\\)[^D^0-9]\". This expression includes the leading space within the parenthesis -since it looks better to highlight it as well. The highlighting -is done with the face `mh-folder-msg-number'. This regular +since it looks better to highlight it as well. The highlighting +is done with the face `mh-folder-msg-number'. This regular expression should be correct as it is needed by non-fontification functions.") @@ -177,21 +177,21 @@ "This regular expression finds the message number width in a scan format. Note that the message number must be placed in a parenthesized -expression as in the default of \"%\\\\([0-9]*\\\\)(msg)\". This +expression as in the default of \"%\\\\([0-9]*\\\\)(msg)\". This variable is only consulted if `mh-scan-format-file' is set to \"Use MH-E scan Format\".") (defvar mh-scan-msg-format-string "%d" "This is a format string for width of the message number in a scan format. -Use \"0%d\" for zero-filled message numbers. This variable is only +Use \"0%d\" for zero-filled message numbers. This variable is only consulted if `mh-scan-format-file' is set to \"Use MH-E scan Format\".") (defvar mh-scan-msg-number-regexp "^ *\\([0-9]+\\)" "This regular expression extracts the message number. -It must match from the beginning of the line. Note that the +It must match from the beginning of the line. Note that the message number must be placed in a parenthesized expression as in the default of \"^ *\\\\([0-9]+\\\\)\".") @@ -211,9 +211,9 @@ Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain two parenthesized expressions. The first is expected to match the \"To:\" that the default scan -format file generates. The second is expected to match the +format file generates. The second is expected to match the recipient's name as in the default of -\"\\\\(To:\\\\)\\\\(..............\\\\)\". If this regular +\"\\\\(To:\\\\)\\\\(..............\\\\)\". If this regular expression is not correct, the \"To:\" string will not be highlighted with the face `mh-folder-to' and the recipient will not be highlighted with the face `mh-folder-address'") @@ -221,7 +221,7 @@ (defvar mh-scan-refiled-msg-regexp "^\\( *[0-9]+\\)\\^" "This regular expression matches refiled messages. -It must match from the beginning of the line. Note that the +It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least one parenthesized expression which matches the message number as in the default of @@ -229,10 +229,10 @@ \"^\\\\( *[0-9]+\\\\)\\\\^\". This expression includes the leading space within the parenthesis -since it looks better to highlight it as well. The highlighting -is done with the face `mh-folder-refiled'. This regular +since it looks better to highlight it as well. The highlighting +is done with the face `mh-folder-refiled'. This regular expression should be correct as it is needed by non-fontification -functions. See also `mh-note-refiled'.") +functions. See also `mh-note-refiled'.") (defvar mh-scan-sent-to-me-sender-regexp "^ *[0-9]+.\\([bct]\\).....[ ]*\\(..................\\)" @@ -240,7 +240,7 @@ Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least two parenthesized -expressions. The first should match the fontification hint (see +expressions. The first should match the fontification hint (see `mh-scan-format-nmh') and the second should match the user name as in the default of @@ -255,15 +255,15 @@ "^ *[0-9]+........[ ]*...................\\([Rr][Ee]\\(\\[[0-9]+\\]\\)?:\\s-*\\)*\\([^<\n]*\\)" "This regular expression matches the subject. -It must match from the beginning of the line. Note that the +It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least three parenthesized expressions. The first is expected to match the \"Re:\" string, if any, and is -highlighted with the face `mh-folder-followup'. The second +highlighted with the face `mh-folder-followup'. The second matches an optional bracketed number after \"Re:\", such as in \"Re[2]:\" (and is thus a sub-expression of the first expression) and the third is expected to match the subject line itself which -is highlighted with the face `mh-folder-subject'. For example, +is highlighted with the face `mh-folder-subject'. For example, the default (broken on multiple lines for readability) is ^ *[0-9]+........[ ]*................... @@ -296,9 +296,9 @@ (defvar mh-scan-cmd-note-width 1 "Number of columns consumed by the cmd-note field in `mh-scan-format'. -This column will have one of the values: \" \", \"D\", \"^\", \"+\" and -where \" \" is the default value, +This column will have one of the values: \" \", \"D\", \"^\", \"+\", where + \" \" is the default value, \"D\" is the `mh-note-deleted' character, \"^\" is the `mh-note-refiled' character, and \"+\" is the `mh-note-cur' character.") @@ -434,7 +434,7 @@ "Return a scan format with the (msg) width in the FMT replaced with WIDTH. The message number width portion of the format is discovered -using `mh-scan-msg-format-regexp'. Its replacement is controlled +using `mh-scan-msg-format-regexp'. Its replacement is controlled with `mh-scan-msg-format-string'." (or (and (string-match mh-scan-msg-format-regexp fmt) @@ -469,7 +469,7 @@ If `mh-scan-format-file' is set to \"Use MH-E scan Format\" this means that either `mh-scan-format-mh' or `mh-scan-format-nmh' are -in use. This function therefore assumes that the first column is +in use. This function therefore assumes that the first column is empty (to provide room for the cursor), the following WIDTH columns contain the message number, and the column for notations comes after that."
--- a/lisp/midnight.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/midnight.el Fri Mar 26 15:03:20 2010 +0000 @@ -3,8 +3,8 @@ ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -;; Author: Sam Steingold <sds@usa.net> -;; Maintainer: Sam Steingold <sds@usa.net> +;; Author: Sam Steingold <sds@gnu.org> +;; Maintainer: Sam Steingold <sds@gnu.org> ;; Created: 1998-05-18 ;; Keywords: utilities @@ -205,7 +205,7 @@ (defun midnight-next () "Return the number of seconds till the next midnight." - (multiple-value-bind (sec min hrs) + (multiple-value-bind (sec min hrs) (values-list (decode-time)) (- (* 24 60 60) (* 60 60 hrs) (* 60 min) sec)))
--- a/lisp/minibuffer.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/minibuffer.el Fri Mar 26 15:03:20 2010 +0000 @@ -393,6 +393,9 @@ "Completion of multiple words, each one taken as a prefix. E.g. M-x l-c-h can complete to list-command-history and C-x C-f /u/m/s to /usr/monnier/src.") + (substring + completion-substring-try-completion completion-substring-all-completions + "Completion of the string taken as a substring.") (initials completion-initials-try-completion completion-initials-all-completions "Completion of acronyms and initialisms. @@ -1099,12 +1102,12 @@ (exit-minibuffer)) (defvar completion-in-region-functions nil - "Wrapper hook around `complete-in-region'. + "Wrapper hook around `completion-in-region'. The functions on this special hook are called with 5 arguments: NEXT-FUN START END COLLECTION PREDICATE. NEXT-FUN is a function of four arguments (START END COLLECTION PREDICATE) -that performs the default operation. The other four argument are like -the ones passed to `complete-in-region'. The functions on this hook +that performs the default operation. The other four arguments are like +the ones passed to `completion-in-region'. The functions on this hook are expected to perform completion on START..END using COLLECTION and PREDICATE, either by calling NEXT-FUN or by doing it themselves.") @@ -1658,6 +1661,12 @@ ;; Nothing to merge. suffix)) +(defun completion-basic--pattern (beforepoint afterpoint bounds) + (delete + "" (list (substring beforepoint (car bounds)) + 'point + (substring afterpoint 0 (cdr bounds))))) + (defun completion-basic-try-completion (string table pred point) (let* ((beforepoint (substring string 0 point)) (afterpoint (substring string point)) @@ -1674,10 +1683,8 @@ (length completion)))) (let* ((suffix (substring afterpoint (cdr bounds))) (prefix (substring beforepoint 0 (car bounds))) - (pattern (delete - "" (list (substring beforepoint (car bounds)) - 'point - (substring afterpoint 0 (cdr bounds))))) + (pattern (completion-basic--pattern + beforepoint afterpoint bounds)) (all (completion-pcm--all-completions prefix pattern table pred))) (if minibuffer-completing-file-name (setq all (completion-pcm--filename-try-filter all))) @@ -1687,12 +1694,8 @@ (let* ((beforepoint (substring string 0 point)) (afterpoint (substring string point)) (bounds (completion-boundaries beforepoint table pred afterpoint)) - (suffix (substring afterpoint (cdr bounds))) (prefix (substring beforepoint 0 (car bounds))) - (pattern (delete - "" (list (substring beforepoint (car bounds)) - 'point - (substring afterpoint 0 (cdr bounds))))) + (pattern (completion-basic--pattern beforepoint afterpoint bounds)) (all (completion-pcm--all-completions prefix pattern table pred))) (completion-hilit-commonality all point (car bounds)))) @@ -2069,7 +2072,38 @@ 'completion-pcm--filename-try-filter)) (completion-pcm--merge-try pattern all prefix suffix))) -;;; Initials completion +;;; Substring completion +;; Mostly derived from the code of `basic' completion. + +(defun completion-substring--all-completions (string table pred point) + (let* ((beforepoint (substring string 0 point)) + (afterpoint (substring string point)) + (bounds (completion-boundaries beforepoint table pred afterpoint)) + (suffix (substring afterpoint (cdr bounds))) + (prefix (substring beforepoint 0 (car bounds))) + (basic-pattern (completion-basic--pattern + beforepoint afterpoint bounds)) + (pattern (if (not (stringp (car basic-pattern))) + basic-pattern + (cons 'any basic-pattern))) + (all (completion-pcm--all-completions prefix pattern table pred))) + (list all pattern prefix suffix (car bounds)))) + +(defun completion-substring-try-completion (string table pred point) + (destructuring-bind (all pattern prefix suffix carbounds) + (completion-substring--all-completions string table pred point) + (if minibuffer-completing-file-name + (setq all (completion-pcm--filename-try-filter all))) + (completion-pcm--merge-try pattern all prefix suffix))) + +(defun completion-substring-all-completions (string table pred point) + (destructuring-bind (all pattern prefix suffix carbounds) + (completion-substring--all-completions string table pred point) + (when all + (nconc (completion-pcm--hilit-commonality pattern all) + (length prefix))))) + +;; Initials completion ;; Complete /ums to /usr/monnier/src or lch to list-command-history. (defun completion-initials-expand (str table pred)
--- a/lisp/mpc.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/mpc.el Fri Mar 26 15:03:20 2010 +0000 @@ -94,54 +94,17 @@ (eval-when-compile (require 'cl)) -;;; Backward compatibility. -;; This code is meant for Emacs-CVS, so to get it to run on anything else, -;; we need to define some more things. - -(unless (fboundp 'tool-bar-local-item) - (defun tool-bar-local-item (icon def key map &rest props) - (define-key-after map (vector key) - `(menu-item ,(symbol-name key) ,def - :image ,(find-image - `((:type xpm :file ,(concat icon ".xpm")))) - ,@props)))) - -(unless (fboundp 'process-put) - (defconst mpc-process-hash (make-hash-table :weakness 'key)) - (defun process-put (proc prop val) - (let ((sym (gethash proc mpc-process-hash))) - (unless sym - (setq sym (puthash proc (make-symbol "mpc-proc-sym") mpc-process-hash))) - (put sym prop val))) - (defun process-get (proc prop) - (let ((sym (gethash proc mpc-process-hash))) - (when sym (get sym prop)))) - (defun process-plist (proc) - (let ((sym (gethash proc mpc-process-hash))) - (when sym (symbol-plist sym))))) -(unless (fboundp 'with-local-quit) - (defmacro with-local-quit (&rest body) - `(condition-case nil (let ((inhibit-quit nil)) ,@body) - (quit (setq quit-flag t) nil)))) -(unless (fboundp 'balance-windows-area) - (defalias 'balance-windows-area 'balance-windows)) -(unless (fboundp 'posn-object) (defalias 'posn-object 'ignore)) -(unless (fboundp 'buffer-local-value) - (defun buffer-local-value (var buf) - (with-current-buffer buf (symbol-value var)))) - - -;;; Main code starts here. - (defgroup mpc () "A Client for the Music Player Daemon." :prefix "mpc-" :group 'multimedia :group 'applications) -(defcustom mpc-browser-tags '(Genre Artist Album Playlist) +(defcustom mpc-browser-tags '(Genre Artist|Composer|Performer + Album|Playlist) "Tags for which a browser buffer should be created by default." - :type '(repeat string)) + ;; FIXME: provide a list of tags, for completion. + :type '(repeat symbol)) ;;; Misc utils ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -620,6 +583,19 @@ ;; (mpc--queue-head))) ;; (message "MPC's queue is out of sync")))))) +(defvar mpc--find-memoize-union-tags nil) + +(defun mpc-cmd-flush (tag value) + (puthash (cons tag value) nil mpc--find-memoize) + (dolist (uniontag mpc--find-memoize-union-tags) + (if (member (symbol-name tag) (split-string (symbol-name uniontag) "|")) + (puthash (cons uniontag value) nil mpc--find-memoize)))) + + +(defun mpc-cmd-special-tag-p (tag) + (or (memq tag '(Playlist Search Directory)) + (string-match "|" (symbol-name tag)))) + (defun mpc-cmd-find (tag value) "Return a list of all songs whose tag TAG has value VALUE. The songs are returned as alists." @@ -628,8 +604,12 @@ (cond ((eq tag 'Playlist) ;; Special case for pseudo-tag playlist. - (let ((l (mpc-proc-buf-to-alists - (mpc-proc-cmd (list "listplaylistinfo" value)))) + (let ((l (condition-case err + (mpc-proc-buf-to-alists + (mpc-proc-cmd (list "listplaylistinfo" value))) + (mpc-proc-error + ;; "[50@0] {listplaylistinfo} No such playlist" + nil))) (i 0)) (mapcar (lambda (s) (prog1 (cons (cons 'Pos (number-to-string i)) s) @@ -648,6 +628,14 @@ (if (eq (car pair) 'directory) nil pair)) pairs))))) + ((string-match "|" (symbol-name tag)) + (add-to-list 'mpc--find-memoize-union-tags tag) + (let ((tag1 (intern (substring (symbol-name tag) + 0 (match-beginning 0)))) + (tag2 (intern (substring (symbol-name tag) + (match-end 0))))) + (mpc-union (mpc-cmd-find tag1 value) + (mpc-cmd-find tag2 value)))) (t (condition-case err (mpc-proc-buf-to-alists @@ -675,7 +663,7 @@ (when other-tag (dolist (pl (prog1 pls (setq pls nil))) (let ((plsongs (mpc-cmd-find 'Playlist pl))) - (if (not (member other-tag '(Playlist Search Directory))) + (if (not (mpc-cmd-special-tag-p other-tag)) (when (member (cons other-tag value) (apply 'append plsongs)) (push pl pls)) @@ -743,6 +731,14 @@ ;; useful that would be tho. ((eq tag 'Search) (error "Not supported")) + ((string-match "|" (symbol-name tag)) + (let ((tag1 (intern (substring (symbol-name tag) + 0 (match-beginning 0)))) + (tag2 (intern (substring (symbol-name tag) + (match-end 0))))) + (mpc-union (mpc-cmd-list tag1 other-tag value) + (mpc-cmd-list tag2 other-tag value)))) + ((null other-tag) (condition-case nil (mapcar 'cdr (mpc-proc-cmd-to-alist (list "list" (symbol-name tag)))) @@ -754,7 +750,7 @@ (mpc-assq-all tag (mpc-proc-cmd-to-alist "listallinfo"))))) (t (condition-case nil - (if (member other-tag '(Search Playlist Directory)) + (if (mpc-cmd-special-tag-p other-tag) (signal 'mpc-proc-error "Not implemented") (mapcar 'cdr (mpc-proc-cmd-to-alist @@ -801,7 +797,7 @@ (list "add" file))) files))) (if (stringp playlist) - (puthash (cons 'Playlist playlist) nil mpc--find-memoize))) + (mpc-cmd-flush 'Playlist playlist))) (defun mpc-cmd-delete (song-poss &optional playlist) "Delete the songs at positions SONG-POSS from PLAYLIST. @@ -928,6 +924,10 @@ ;;; Formatter ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun mpc-secs-to-time (secs) + ;; We could use `format-seconds', but it doesn't seem worth the trouble + ;; because we'd still need to check (>= secs (* 60 100)) since the special + ;; %z only allows us to drop the large units for small values but + ;; not to drop the small units for large values. (if (stringp secs) (setq secs (string-to-number secs))) (if (>= secs (* 60 100)) ;More than 100 minutes. (format "%dh%02d" ;"%d:%02d:%02d" @@ -1432,6 +1432,20 @@ (with-current-buffer buf (with-local-quit (mpc-tagbrowser-refresh))))) (with-local-quit (mpc-songs-refresh)))) +(defun mpc-tagbrowser-tag-name (tag) + (cond + ((string-match "|" (symbol-name tag)) + (let ((tag1 (intern (substring (symbol-name tag) + 0 (match-beginning 0)))) + (tag2 (intern (substring (symbol-name tag) + (match-end 0))))) + (concat (mpc-tagbrowser-tag-name tag1) + " | " + (mpc-tagbrowser-tag-name tag2)))) + ((string-match "y\\'" (symbol-name tag)) + (concat (substring (symbol-name tag) 0 -1) "ies")) + (t (concat (symbol-name tag) "s")))) + (defun mpc-tagbrowser-buf (tag) (let ((buf (mpc-proc-buffer (mpc-proc) tag))) (if (buffer-live-p buf) buf @@ -1446,10 +1460,7 @@ (insert mpc-tagbrowser-all-name "\n")) (forward-line -1) (setq mpc-tag tag) - (setq mpc-tag-name - (if (string-match "y\\'" (symbol-name tag)) - (concat (substring (symbol-name tag) 0 -1) "ies") - (concat (symbol-name tag) "s"))) + (setq mpc-tag-name (mpc-tagbrowser-tag-name tag)) (mpc-tagbrowser-all-select) (mpc-tagbrowser-refresh) buf)))) @@ -1858,20 +1869,22 @@ (mapcar (lambda (val) (mpc-cmd-find (car cst) val)) (cdr cst))))) - (setq active (if (null active) - (progn + (setq active (cond + ((null active) (if (eq (car cst) 'Playlist) (setq dontsort t)) vals) - (if (or dontsort + ((or dontsort ;; Try to preserve ordering and ;; repetitions from playlists. (not (eq (car cst) 'Playlist))) (mpc-intersection active vals - (lambda (x) (assq 'file x))) + (lambda (x) (assq 'file x)))) + (t (setq dontsort t) (mpc-intersection vals active - (lambda (x) (assq 'file x))))))))) + (lambda (x) + (assq 'file x))))))))) (mpc-select-save (erase-buffer) ;; Sorting songs is surprisingly difficult: when comparing two @@ -1902,9 +1915,10 @@ )) (goto-char (point-min)) (forward-line (car curline)) - (when (or (search-forward (cdr curline) nil t) + (if (or (search-forward (cdr curline) nil t) (search-backward (cdr curline) nil t)) - (beginning-of-line)) + (beginning-of-line) + (goto-char (point-min))) (set (make-local-variable 'mpc-songs-totaltime) (unless (zerop totaltime) (list " " (mpc-secs-to-time totaltime))))
--- a/lisp/net/tramp.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/net/tramp.el Fri Mar 26 15:03:20 2010 +0000 @@ -6295,7 +6295,7 @@ Returns the absolute file name of PROGNAME, if found, and nil otherwise. This function expects to be in the right *tramp* buffer." - (with-current-buffer (tramp-get-buffer vec) + (with-current-buffer (tramp-get-connection-buffer vec) (let (result) ;; Check whether the executable is in $PATH. "which(1)" does not ;; report always a correct error code; therefore we check the @@ -6303,7 +6303,7 @@ (unless ignore-path (tramp-send-command vec (format "which \\%s | wc -w" progname)) (goto-char (point-min)) - (if (looking-at "^1$") + (if (looking-at "^\\s-*1$") (setq result (concat "\\" progname)))) (unless result (when ignore-tilde @@ -6404,12 +6404,15 @@ (with-current-buffer (tramp-get-buffer vec) (tramp-send-command vec "echo ~root" t) (cond - ((string-match "^~root$" (buffer-string)) + ((or (string-match "^~root$" (buffer-string)) + ;; The default shell (ksh93) of OpenSolaris is buggy. + (string-equal (tramp-get-connection-property vec "uname" "") + "SunOS 5.11")) (setq shell (or (tramp-find-executable - vec "bash" (tramp-get-remote-path vec) t) + vec "bash" (tramp-get-remote-path vec) t t) (tramp-find-executable - vec "ksh" (tramp-get-remote-path vec) t))) + vec "ksh" (tramp-get-remote-path vec) t t))) (unless shell (tramp-error vec 'file-error @@ -6838,9 +6841,11 @@ ;; "test foo; echo $?" to check if various conditions hold, and ;; there are buggy /bin/sh implementations which don't execute the ;; "echo $?" part if the "test" part has an error. In particular, - ;; the Solaris /bin/sh is a problem. I'm betting that all systems - ;; with buggy /bin/sh implementations will have a working bash or - ;; ksh. Whee... + ;; the OpenSolaris /bin/sh is a problem. There are also other + ;; problems with /bin/sh of OpenSolaris, like redirection of stderr + ;; in in function declarations, or changing HISTFILE in place. + ;; Therefore, OpenSolaris' /bin/sh is replaced by bash, when + ;; detected. (tramp-find-shell vec) ;; Disable unexpected output. @@ -6849,12 +6854,6 @@ ;; Set the environment. (tramp-message vec 5 "Setting default environment") - ;; On OpenSolaris, there is a bug when HISTFILE is changed in place - ;; <http://bugs.opensolaris.org/view_bug.do?bug_id=6834184>. We - ;; apply the workaround. - (if (string-equal (tramp-get-connection-property vec "uname" "") "SunOS 5.11") - (tramp-send-command vec "unset HISTFILE" t)) - (let ((env (copy-sequence tramp-remote-process-environment)) unset item) (while env
--- a/lisp/net/trampver.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/net/trampver.el Fri Mar 26 15:03:20 2010 +0000 @@ -29,7 +29,7 @@ ;; "autoconf && ./configure" to change them. (X)Emacs version check is defined ;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there. -(defconst tramp-version "2.1.18-pre" +(defconst tramp-version "2.1.18-23.2" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org"
--- a/lisp/obsolete/levents.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/obsolete/levents.el Fri Mar 26 15:03:20 2010 +0000 @@ -61,7 +61,7 @@ (put 'timeout 'event-symbol-elements '(eval)) (defun allocate-event () - "Returns an empty event structure. + "Return an empty event structure. In this emulation, it returns nil." nil) @@ -142,7 +142,7 @@ (nth 1 event)) (defun event-key (event) - "Returns the KeySym of the given key-press event. + "Return the KeySym of the given key-press event. The value is an ASCII printing character (not upper case) or a symbol." (if (symbolp event) (car (get event 'event-symbol-elements)) @@ -150,11 +150,11 @@ (downcase (if (< base 32) (logior base 64) base))))) (defun event-object (event) - "Returns the function argument of the given timeout, menu, or eval event." + "Return the function argument of the given timeout, menu, or eval event." (nth 2 event)) (defun event-point (event) - "Returns the character position of the given mouse-related event. + "Return the character position of the given mouse-related event. If the event did not occur over a window, or did not occur over text, then this returns nil. Otherwise, it returns an index into the buffer visible in the event's window." @@ -201,18 +201,18 @@ (window-start start-window))))) (defun event-process (event) - "Returns the process of the given process-output event." + "Return the process of the given process-output event." (nth 1 event)) (defun event-timestamp (event) - "Returns the timestamp of the given event object. + "Return the timestamp of the given event object. In Lucid Emacs, this works for any kind of event. In this emulation, it returns nil for non-mouse-related events." (and (listp event) (posn-timestamp (event-end event)))) (defun event-to-character (event &optional lenient) - "Returns the closest ASCII approximation to the given event object. + "Return the closest ASCII approximation to the given event object. If the event isn't a keypress, this returns nil. If the second argument is non-nil, then this is lenient in its translation; it will ignore modifier keys other than control and meta, @@ -229,25 +229,25 @@ event nil))) (defun event-window (event) - "Returns the window of the given mouse-related event object." + "Return the window of the given mouse-related event object." (posn-window (event-end event))) (defun event-x (event) - "Returns the X position in characters of the given mouse-related event." + "Return the X position in characters of the given mouse-related event." (/ (car (posn-col-row (event-end event))) (frame-char-width (window-frame (event-window event))))) (defun event-x-pixel (event) - "Returns the X position in pixels of the given mouse-related event." + "Return the X position in pixels of the given mouse-related event." (car (posn-col-row (event-end event)))) (defun event-y (event) - "Returns the Y position in characters of the given mouse-related event." + "Return the Y position in characters of the given mouse-related event." (/ (cdr (posn-col-row (event-end event))) (frame-char-height (window-frame (event-window event))))) (defun event-y-pixel (event) - "Returns the Y position in pixels of the given mouse-related event." + "Return the Y position in pixels of the given mouse-related event." (cdr (posn-col-row (event-end event)))) (defun key-press-event-p (obj)
--- a/lisp/progmodes/cc-engine.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/progmodes/cc-engine.el Fri Mar 26 15:03:20 2010 +0000 @@ -2624,7 +2624,7 @@ (< (point-max) c-state-old-cpp-end))) (point-max) (min (point-max) c-state-old-cpp-beg))) - (while (and c-state-cache (> (c-state-cache-top-lparen) upper-lim)) + (while (and c-state-cache (>= (c-state-cache-top-lparen) upper-lim)) (setq c-state-cache (cdr c-state-cache))) ;; If `upper-lim' is inside the last recorded brace pair, remove its ;; RBrace and indicate we'll need to search backwards for a previous
--- a/lisp/progmodes/compile.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/progmodes/compile.el Fri Mar 26 15:03:20 2010 +0000 @@ -733,6 +733,9 @@ "If non-nil, automatically jump to the next error encountered.") (make-variable-buffer-local 'compilation-auto-jump-to-next) +(defvar buffer-modtime nil + "The buffer modification time, for buffers not associated with files.") +(make-variable-buffer-local 'buffer-modtime) (defvar compilation-skip-to-next-location t "*If non-nil, skip multiple error messages for the same source location.") @@ -1566,6 +1569,7 @@ mode-name (or name-of-mode "Compilation")) (set (make-local-variable 'page-delimiter) compilation-page-delimiter) + (set (make-local-variable 'buffer-modtime) nil) (compilation-setup) (setq buffer-read-only t) (run-mode-hooks 'compilation-mode-hook)) @@ -1781,6 +1785,7 @@ (unless comint-inhibit-carriage-motion (comint-carriage-motion (process-mark proc) (point))) (set-marker (process-mark proc) (point)) + (set (make-local-variable 'buffer-modtime) (current-time)) (run-hooks 'compilation-filter-hook)) (goto-char pos) (narrow-to-region min max) @@ -1954,9 +1959,7 @@ ;; There may be no timestamp info if the loc is a `fake-loc', ;; but we just checked that the file has been visited before! (equal (nth 4 loc) - (setq timestamp - (with-current-buffer (marker-buffer (nth 3 loc)) - (visited-file-modtime))))) + (setq timestamp buffer-modtime))) (with-current-buffer (compilation-find-file marker (caar (nth 2 loc)) (cadr (car (nth 2 loc)))) (save-restriction
--- a/lisp/progmodes/make-mode.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/progmodes/make-mode.el Fri Mar 26 15:03:20 2010 +0000 @@ -272,7 +272,7 @@ "Characters to skip to find a line that might be a dependency.") (defvar makefile-rule-action-regex - "^\t[ \t]*\\([-@]*\\)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)" + "^\t[ \t]*\\(?:\\([-@]+\\)[ \t]*\\)\\(.*\\(?:\\\\\n.*\\)*\\)" "Regex used to highlight rule action lines in font lock mode.") (defconst makefile-makepp-rule-action-regex @@ -281,8 +281,7 @@ "Regex used to highlight makepp rule action lines in font lock mode.") (defconst makefile-bsdmake-rule-action-regex - (progn (string-match "-@" makefile-rule-action-regex) - (replace-match "-+@" t t makefile-rule-action-regex)) + (replace-regexp-in-string "-@" "-+@" makefile-rule-action-regex) "Regex used to highlight BSD rule action lines in font lock mode.") ;; Note that the first and second subexpression is used by font lock. Note @@ -355,8 +354,9 @@ (3 'font-lock-string-face prepend t)) ;; Rule actions. + ;; FIXME: When this spans multiple lines we need font-lock-multiline. (makefile-match-action - (1 font-lock-type-face) + (1 font-lock-type-face nil t) (2 'makefile-shell prepend) ;; Only makepp has builtin commands. (3 font-lock-builtin-face prepend t)) @@ -520,25 +520,25 @@ ("Macro Assignment" ,makefile-macroassign-regex 1)) "Imenu generic expression for Makefile mode. See `imenu-generic-expression'.") -;;; ------------------------------------------------------------ -;;; The following configurable variables are used in the -;;; up-to-date overview . -;;; The standard configuration assumes that your `make' program -;;; can be run in question/query mode using the `-q' option, this -;;; means that the command -;;; -;;; make -q foo -;;; -;;; should return an exit status of zero if the target `foo' is -;;; up to date and a nonzero exit status otherwise. -;;; Many makes can do this although the docs/manpages do not mention -;;; it. Try it with your favourite one. GNU make, System V make, and -;;; Dennis Vadura's DMake have no problems. -;;; Set the variable `makefile-brave-make' to the name of the -;;; make utility that does this on your system. -;;; To understand what this is all about see the function definition -;;; of `makefile-query-by-make-minus-q' . -;;; ------------------------------------------------------------ +;; ------------------------------------------------------------ +;; The following configurable variables are used in the +;; up-to-date overview . +;; The standard configuration assumes that your `make' program +;; can be run in question/query mode using the `-q' option, this +;; means that the command +;; +;; make -q foo +;; +;; should return an exit status of zero if the target `foo' is +;; up to date and a nonzero exit status otherwise. +;; Many makes can do this although the docs/manpages do not mention +;; it. Try it with your favourite one. GNU make, System V make, and +;; Dennis Vadura's DMake have no problems. +;; Set the variable `makefile-brave-make' to the name of the +;; make utility that does this on your system. +;; To understand what this is all about see the function definition +;; of `makefile-query-by-make-minus-q' . +;; ------------------------------------------------------------ (defcustom makefile-brave-make "make" "*How to invoke make, for `makefile-query-targets'. @@ -573,11 +573,8 @@ ;;; --- end of up-to-date-overview configuration ------------------ -(defvar makefile-mode-abbrev-table nil +(define-abbrev-table 'makefile-mode-abbrev-table () "Abbrev table in use in Makefile buffers.") -(if makefile-mode-abbrev-table - () - (define-abbrev-table 'makefile-mode-abbrev-table ())) (defvar makefile-mode-map (let ((map (make-sparse-keymap)) @@ -705,15 +702,13 @@ (modify-syntax-entry ?\n "> " st) st)) -(defvar makefile-imake-mode-syntax-table (copy-syntax-table - makefile-mode-syntax-table)) -(if makefile-imake-mode-syntax-table - () - (modify-syntax-entry ?/ ". 14" makefile-imake-mode-syntax-table) - (modify-syntax-entry ?* ". 23" makefile-imake-mode-syntax-table) - (modify-syntax-entry ?# "'" makefile-imake-mode-syntax-table) - (modify-syntax-entry ?\n ". b" makefile-imake-mode-syntax-table)) - +(defvar makefile-imake-mode-syntax-table + (let ((st (make-syntax-table makefile-mode-syntax-table))) + (modify-syntax-entry ?/ ". 14" st) + (modify-syntax-entry ?* ". 23" st) + (modify-syntax-entry ?# "'" st) + (modify-syntax-entry ?\n ". b" st) + st)) ;;; ------------------------------------------------------------ ;;; Internal variables. @@ -773,7 +768,7 @@ ;;; ------------------------------------------------------------ ;;;###autoload -(defun makefile-mode () +(define-derived-mode makefile-mode nil "Makefile" "Major mode for editing standard Makefiles. If you are editing a file for a different make, try one of the @@ -857,9 +852,6 @@ List of special targets. You will be offered to complete on one of those in the minibuffer whenever you enter a `.'. at the beginning of a line in Makefile mode." - - (interactive) - (kill-all-local-variables) (add-hook 'write-file-functions 'makefile-warn-suspicious-lines nil t) (add-hook 'write-file-functions @@ -873,59 +865,44 @@ (make-local-variable 'makefile-need-macro-pickup) ;; Font lock. - (make-local-variable 'font-lock-defaults) - (setq font-lock-defaults - ;; SYNTAX-BEGIN set to backward-paragraph to avoid slow-down - ;; near the end of a large buffer, due to parse-partial-sexp's - ;; trying to parse all the way till the beginning of buffer. - '(makefile-font-lock-keywords - nil nil - ((?$ . ".")) - backward-paragraph - (font-lock-syntactic-keywords - . makefile-font-lock-syntactic-keywords))) + (set (make-local-variable 'font-lock-defaults) + ;; SYNTAX-BEGIN set to backward-paragraph to avoid slow-down + ;; near the end of a large buffer, due to parse-partial-sexp's + ;; trying to parse all the way till the beginning of buffer. + '(makefile-font-lock-keywords + nil nil + ((?$ . ".")) + backward-paragraph + (font-lock-syntactic-keywords + . makefile-font-lock-syntactic-keywords))) ;; Add-log. - (make-local-variable 'add-log-current-defun-function) - (setq add-log-current-defun-function 'makefile-add-log-defun) + (set (make-local-variable 'add-log-current-defun-function) + 'makefile-add-log-defun) ;; Imenu. - (make-local-variable 'imenu-generic-expression) - (setq imenu-generic-expression makefile-imenu-generic-expression) + (set (make-local-variable 'imenu-generic-expression) + makefile-imenu-generic-expression) ;; Dabbrev. - (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) - (setq dabbrev-abbrev-skip-leading-regexp "\\$") + (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "\\$") ;; Other abbrevs. (setq local-abbrev-table makefile-mode-abbrev-table) ;; Filling. - (make-local-variable 'fill-paragraph-function) - (setq fill-paragraph-function 'makefile-fill-paragraph) + (set (make-local-variable 'fill-paragraph-function) 'makefile-fill-paragraph) ;; Comment stuff. - (make-local-variable 'comment-start) - (setq comment-start "#") - (make-local-variable 'comment-end) - (setq comment-end "") - (make-local-variable 'comment-start-skip) - (setq comment-start-skip "#+[ \t]*") + (set (make-local-variable 'comment-start) "#") + (set (make-local-variable 'comment-end) "") + (set (make-local-variable 'comment-start-skip) "#+[ \t]*") ;; Make sure TAB really inserts \t. (set (make-local-variable 'indent-line-function) 'indent-to-left-margin) - ;; become the current major mode - (setq major-mode 'makefile-mode) - (setq mode-name "Makefile") - - ;; Activate keymap and syntax table. - (use-local-map makefile-mode-map) - (set-syntax-table makefile-mode-syntax-table) - ;; Real TABs are important in makefiles - (setq indent-tabs-mode t) - (run-mode-hooks 'makefile-mode-hook)) + (setq indent-tabs-mode t)) ;; These should do more than just differentiate font-lock. ;;;###autoload
--- a/lisp/replace.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/replace.el Fri Mar 26 15:03:20 2010 +0000 @@ -1016,18 +1016,7 @@ (setq count (+ count (if forwardp -1 1))) (setq beg (line-beginning-position) end (line-end-position)) - (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode) - (text-property-not-all beg end 'fontified t)) - (if (fboundp 'jit-lock-fontify-now) - (jit-lock-fontify-now beg end))) - (push - (if (and keep-props (not (eq occur-excluded-properties t))) - (let ((str (buffer-substring beg end))) - (remove-list-of-text-properties - 0 (length str) occur-excluded-properties str) - str) - (buffer-substring-no-properties beg end)) - result) + (push (occur-engine-line beg end keep-props) result) (forward-line (if forwardp 1 -1))) (nreverse result)))) @@ -1056,7 +1045,7 @@ (defun occur (regexp &optional nlines) "Show all lines in the current buffer containing a match for REGEXP. -This function can not handle matches that span more than one line. +If a match spreads across multiple lines, all those lines are shown. Each line is displayed with NLINES lines before and after, or -NLINES before if NLINES is negative. @@ -1221,24 +1210,17 @@ (when (setq endpt (re-search-forward regexp nil t)) (setq matches (1+ matches)) ;; increment match count (setq matchbeg (match-beginning 0)) - (setq lines (+ lines (1- (count-lines origpt endpt)))) + ;; Get beginning of first match line and end of the last. (save-excursion (goto-char matchbeg) - (setq begpt (line-beginning-position) - endpt (line-end-position))) + (setq begpt (line-beginning-position)) + (goto-char endpt) + (setq endpt (line-end-position))) + ;; Sum line numbers up to the first match line. + (setq lines (+ lines (count-lines origpt begpt))) (setq marker (make-marker)) (set-marker marker matchbeg) - (if (and keep-props - (if (boundp 'jit-lock-mode) jit-lock-mode) - (text-property-not-all begpt endpt 'fontified t)) - (if (fboundp 'jit-lock-fontify-now) - (jit-lock-fontify-now begpt endpt))) - (if (and keep-props (not (eq occur-excluded-properties t))) - (progn - (setq curstring (buffer-substring begpt endpt)) - (remove-list-of-text-properties - 0 (length curstring) occur-excluded-properties curstring)) - (setq curstring (buffer-substring-no-properties begpt endpt))) + (setq curstring (occur-engine-line begpt endpt keep-props)) ;; Highlight the matches (let ((len (length curstring)) (start 0)) @@ -1255,24 +1237,33 @@ curstring) (setq start (match-end 0)))) ;; Generate the string to insert for this match - (let* ((out-line + (let* ((match-prefix + ;; Using 7 digits aligns tabs properly. + (apply #'propertize (format "%7d:" lines) + (append + (when prefix-face + `(font-lock-face prefix-face)) + `(occur-prefix t mouse-face (highlight) + occur-target ,marker follow-link t + help-echo "mouse-2: go to this occurrence")))) + (match-str + ;; We don't put `mouse-face' on the newline, + ;; because that loses. And don't put it + ;; on context lines to reduce flicker. + (propertize curstring 'mouse-face (list 'highlight) + 'occur-target marker + 'follow-link t + 'help-echo + "mouse-2: go to this occurrence")) + (out-line (concat - ;; Using 7 digits aligns tabs properly. - (apply #'propertize (format "%7d:" lines) - (append - (when prefix-face - `(font-lock-face prefix-face)) - `(occur-prefix t mouse-face (highlight) - occur-target ,marker follow-link t - help-echo "mouse-2: go to this occurrence"))) - ;; We don't put `mouse-face' on the newline, - ;; because that loses. And don't put it - ;; on context lines to reduce flicker. - (propertize curstring 'mouse-face (list 'highlight) - 'occur-target marker - 'follow-link t - 'help-echo - "mouse-2: go to this occurrence") + match-prefix + ;; Add non-numeric prefix to all non-first lines + ;; of multi-line matches. + (replace-regexp-in-string + "\n" + "\n :" + match-str) ;; Add marker at eol, but no mouse props. (propertize "\n" 'occur-target marker))) (data @@ -1291,7 +1282,11 @@ (goto-char endpt)) (if endpt (progn - (setq lines (1+ lines)) + ;; Sum line numbers between first and last match lines. + (setq lines (+ lines (count-lines begpt endpt) + ;; Add 1 for empty last match line since + ;; count-lines returns 1 line less. + (if (and (bolp) (eolp)) 1 0))) ;; On to the next match... (forward-line 1)) (goto-char (point-max)))))) @@ -1335,6 +1330,18 @@ ;; Return the number of matches globalcount))) +(defun occur-engine-line (beg end &optional keep-props) + (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode) + (text-property-not-all beg end 'fontified t)) + (if (fboundp 'jit-lock-fontify-now) + (jit-lock-fontify-now beg end))) + (if (and keep-props (not (eq occur-excluded-properties t))) + (let ((str (buffer-substring beg end))) + (remove-list-of-text-properties + 0 (length str) occur-excluded-properties str) + str) + (buffer-substring-no-properties beg end))) + ;; Generate context display for occur. ;; OUT-LINE is the line where the match is. ;; NLINES and KEEP-PROPS are args to occur-engine.
--- a/lisp/textmodes/flyspell.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/textmodes/flyspell.el Fri Mar 26 15:03:20 2010 +0000 @@ -359,7 +359,7 @@ (put 'html-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) (put 'nxml-mode 'flyspell-mode-predicate 'sgml-mode-flyspell-verify) -(declare-function sgml-lexical-context "sgml-mode" &optional limit) +(autoload 'sgml-lexical-context "sgml-mode") (defun sgml-mode-flyspell-verify () "Function used for `flyspell-generic-check-word-predicate' in SGML mode.
--- a/lisp/textmodes/reftex-vars.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/textmodes/reftex-vars.el Fri Mar 26 15:03:20 2010 +0000 @@ -100,22 +100,22 @@ ("enumerate" ?i "item:" "~\\ref{%s}" item (regexp "items?" "Punkte?")) - + ("equation" ?e "eq:" "~(\\ref{%s})" t (regexp "equations?" "eqs?\\." "eqn\\." "Gleichung\\(en\\)?" "Gl\\.")) ("eqnarray" ?e "eq:" nil eqnarray-like) - + ("figure" ?f "fig:" "~\\ref{%s}" caption (regexp "figure?[sn]?" "figs?\\." "Abbildung\\(en\\)?" "Abb\\.")) ("figure*" ?f nil nil caption) - + ("table" ?t "tab:" "~\\ref{%s}" caption (regexp "tables?" "tab\\." "Tabellen?")) ("table*" ?t nil nil caption) - + ("\\footnote[]{}" ?n "fn:" "~\\ref{%s}" 2 (regexp "footnotes?" "Fussnoten?")) - + ("any" ?\ " " "~\\ref{%s}" nil) ;; The label macro is hard coded, but it *could* be defined like this: @@ -207,7 +207,7 @@ `?t' should point to a textual citation (citation as a noun). `?p' should point to a parenthetical citation.") -(defconst reftex-index-macros-builtin +(defconst reftex-index-macros-builtin '((default "Default \\index and \\glossary macros" (("\\index{*}" "idx" ?i "" nil t) ("\\glossary{*}" "glo" ?g "" nil t))) @@ -219,9 +219,9 @@ (Index-Shortcut "index.sty with \\shortindexingon" (("\\index[]{*}" 1 ?i "" nil t) ("\\index*[]{*}" 1 ?I "" nil nil) - ("^[]{*}" 1 ?^ "" texmathp t) + ("^[]{*}" 1 ?^ "" texmathp t) ("_[]{*}" 1 ?_ "" texmathp nil)))) - "Builtin stuff for reftex-index-macros. + "Builtin stuff for `reftex-index-macros'. Lower-case symbols correspond to a style file of the same name in the LaTeX distribution. Mixed-case symbols are convenience aliases.") ) @@ -231,7 +231,7 @@ (defgroup reftex nil "LaTeX label and citation support." :tag "RefTeX" - :link '(url-link :tag "Home Page" + :link '(url-link :tag "Home Page" "http://staff.science.uva.nl/~dominik/Tools/reftex/") :link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el") :link '(custom-manual "(reftex)Top") @@ -280,7 +280,7 @@ level means the same level as the positive value, but the section will never get a number. The cdr may also be a function which will be called to after the section-re matched to determine the level. -This list is also used for promotion and demption of sectioning commands. +This list is also used for promotion and demotion of sectioning commands. If you are using a document class which has several sets of sectioning commands, promotion only works correctly if this list is sorted first by set, then within each set by level. The promotion commands always @@ -318,7 +318,7 @@ more than `reftex-idle-time' seconds. Value t means, turn on immediately when RefTeX gets started. Then, -recentering will work for any toc window created during the session. +recentering will work for any TOC window created during the session. Value 'frame (the default) means, turn automatic recentering on only while the dedicated TOC frame does exist, and do the recentering only in that frame. So @@ -326,14 +326,14 @@ automatic recentering is turned on. When the frame gets destroyed, automatic recentering is turned off again. -This feature can be turned on and off from the menu +This feature can be turned on and off from the menu \(Ref->Options)." :group 'reftex-table-of-contents-browser :type '(choice (const :tag "never" nil) (const :tag "always" t) (const :tag "in dedicated frame only" frame))) - + (defcustom reftex-toc-split-windows-horizontally nil "*Non-nil means, create TOC window by splitting window horizontally." :group 'reftex-table-of-contents-browser @@ -407,7 +407,7 @@ :type 'boolean) (defcustom reftex-toc-mode-hook nil - "Mode hook for reftex-toc-mode." + "Mode hook for `reftex-toc-mode'." :group 'reftex-table-of-contents-browser :type 'hook) @@ -425,7 +425,7 @@ '(amsmath endnotes fancybox floatfig longtable picinpar rotating sidecap subfigure supertab wrapfig LaTeX) "Default label alist specifications. LaTeX should always be the last entry. -The value of this variable is a list of symbols with associations in the +The value of this variable is a list of symbols with associations in the constant `reftex-label-alist-builtin'. Check that constant for a full list of options." :group 'reftex-defining-label-environments @@ -624,7 +624,7 @@ (defcustom reftex-section-prefixes '((0 . "part:") (1 . "cha:") (t . "sec:")) "Prefixes for section labels. When the label prefix given in an entry in `reftex-label-alist' contains `%S', -this list is used to determine the correct prefix string depending on the +this list is used to determine the correct prefix string depending on the current section level. The list is an alist, with each entry of the form (KEY . PREFIX) Possible keys are sectioning macro names like `chapter', section levels @@ -686,7 +686,7 @@ (regexp) (repeat :tag "List" (string :tag "prefix (with colon)")))) - + (defcustom reftex-special-environment-functions nil "List of functions to be called when trying to figure out current environment. These are special functions to detect \"environments\" which do not @@ -732,7 +732,7 @@ (let ((pos (point)) p1) (save-excursion ;; Search for any of the linguex item macros at the beginning of a line - (if (re-search-backward + (if (re-search-backward \"^[ \\t]*\\\\(\\\\\\\\\\\\(ex\\\\|a\\\\|b\\\\|c\\\\|d\\\\|e\\\\|f\\\\)g?\\\\.\\\\)\" bound t) (progn (setq p1 (match-beginning 1)) @@ -742,7 +742,7 @@ nil ;; OK, we got it (cons \"linguex\" p1))) - ;; Return nil for not found + ;; Return nil for not found nil)))) 3. Tell RefTeX to use this function @@ -941,7 +941,7 @@ (defcustom reftex-vref-is-default nil "*Non-nil means, the varioref macro \\vref is used as default. -In the selection buffer, the `v' key toggles the reference macro between +In the selection buffer, the `v' key toggles the reference macro between `\\ref' and `\\vref'. The value of this variable determines the default which is active when entering the selection process. Instead of nil or t, this may also be a string of type letters indicating @@ -952,7 +952,7 @@ (defcustom reftex-fref-is-default nil "*Non-nil means, the fancyref macro \\fref is used as default. -In the selection buffer, the `V' key toggles the reference macro between +In the selection buffer, the `V' key toggles the reference macro between `\\ref', `\\fref' and `\\Fref'. The value of this variable determines the default which is active when entering the selection process. Instead of nil or t, this may also be a string of type letters indicating @@ -979,7 +979,7 @@ (defcustom reftex-format-ref-function nil "Function which produces the string to insert as a reference. -Normally should be nil, because the format to insert a reference can +Normally should be nil, because the format to insert a reference can already be specified in `reftex-label-alist'. This hook also is used by the special commands to insert `\\vref' and `\\fref' references, so even if you set this, your setting will be ignored by @@ -1060,13 +1060,13 @@ %i institution %j journal %k key %m month %n number %o organization %p pages %P first page %r address %s school %u publisher %t title -%v volume %y year +%v volume %y year %B booktitle, abbreviated %T title, abbreviated Usually, only %l is needed. The other stuff is mainly for the echo area display, and for (setq reftex-comment-citations t). -%< as a special operator kills punctuation and space around it after the +%< as a special operator kills punctuation and space around it after the string has been formatted. A pair of square brackets indicates an optional argument, and RefTeX @@ -1081,7 +1081,7 @@ strings. In order to configure this variable, you can either set `reftex-cite-format' directly yourself or set it to the SYMBOL of one of -the predefined styles. The predefined symbols are those which have an +the predefined styles. The predefined symbols are those which have an association in the constant `reftex-cite-format-builtin'. E.g.: (setq reftex-cite-format 'natbib)" :group 'reftex-citation-support @@ -1164,8 +1164,8 @@ (defcustom reftex-cite-punctuation '(", " " \\& " " {\\it et al.}") "Punctuation for formatting of name lists in citations. This is a list of 3 strings. -1. normal names separator, like \", \" in Jones, Brown and Miller -2. final names separator, like \" and \" in Jones, Brown and Miller +1. Normal names separator, like \", \" in Jones, Brown and Miller +2. Final names separator, like \" and \" in Jones, Brown and Miller 3. The \"et al\" string, like \" {\\it et al.}\" in Jones {\\it et al.}" :group 'reftex-citation-support :type '(list @@ -1175,7 +1175,7 @@ (defcustom reftex-format-cite-function nil "Function which produces the string to insert as a citation. -Normally should be nil, because the format to insert a reference can +Normally should be nil, because the format to insert a reference can already be specified in `reftex-cite-format'. The function will be called with two arguments, the CITATION KEY and the DEFAULT FORMAT, which is taken from `reftex-cite-format'. The function @@ -1258,7 +1258,7 @@ :group 'reftex-index-support :set 'reftex-set-dirty :type `(list - (repeat + (repeat :inline t (list :value ("" "idx" ?a "" nil) (string :tag "Macro with args") @@ -1285,7 +1285,7 @@ This is a list with (MACRO-KEY DEFAULT-TAG). MACRO-KEY: Character identifying an index macro - see `reftex-index-macros'. -DEFAULT-TAG: This is the tag to be used if the macro requires a TAG argument. +DEFAULT-TAG: This is the tag to be used if the macro requires a TAG argument. When this is nil and a TAG is needed, RefTeX will ask for it. When this is the empty string and the TAG argument of the index macro is optional, the TAG argument will be omitted." @@ -1426,7 +1426,7 @@ (defcustom reftex-index-include-context nil "*Non-nil means, display the index definition context in the index buffer. -This flag may also be toggled from the index buffer with the `c' key." +This flag may also be toggled from the index buffer with the `c' key." :group 'reftex-index-support :type 'boolean) @@ -1449,7 +1449,7 @@ argument of a macro. Note that crossref viewing for citations, references (both ways) and index entries is hard-coded. This variable is only to configure additional structures for which crossreference -viewing can be useful. Each entry has the structure +viewing can be useful. Each entry has the structure \(MACRO-RE SEARCH-RE HIGHLIGHT). @@ -1470,7 +1470,7 @@ displayed, the echo area will display information about that cross reference. You can also set the variable to the symbol `window'. In this case a small temporary window is used for the display. -This feature can be turned on and off from the menu +This feature can be turned on and off from the menu \(Ref->Options)." :group 'reftex-viewing-cross-references :type '(choice (const :tag "off" nil) @@ -1516,7 +1516,7 @@ - If an element is the name of an environment variable, its content is used. - If an element starts with an exclamation mark, it is used as a command to retrieve the path. A typical command with the kpathsearch library would - be `!kpsewhich -show-path=.tex'. + be `!kpsewhich -show-path=.tex'. - Otherwise the element itself is interpreted as a path. Multiple directories can be separated by the system dependent `path-separator'. Directories ending in `//' or `!!' will be expanded recursively. @@ -1531,7 +1531,7 @@ - If an element is the name of an environment variable, its content is used. - If an element starts with an exclamation mark, it is used as a command to retrieve the path. A typical command with the kpathsearch library would - be `!kpsewhich -show-path=.bib'. + be `!kpsewhich -show-path=.bib'. - Otherwise the element itself is interpreted as a path. Multiple directories can be separated by the system dependent `path-separator'. Directories ending in `//' or `!!' will be expanded recursively. @@ -1575,7 +1575,7 @@ "*Non-nil means, search all specified directories before trying recursion. Thus, in a path \".//:/tex/\", search first \"./\", then \"/tex/\" and then all subdirectories of \"./\". If this option is nil, the subdirectories of -\"./\" are searched before \"/tex/\". This is mainly for speed - most of the +\"./\" are searched before \"/tex/\". This is mainly for speed - most of the time the recursive path is for the system files and not for the user files. Set this to nil if the default makes RefTeX finding files with equal names in wrong sequence." @@ -1588,7 +1588,7 @@ TEXINPUTS and BIBINPUTS to find TeX files and BibTeX database files. With this option turned on, it calls an external program specified in the option `reftex-external-file-finders' instead. As a side effect, -the variables `reftex-texpath-environment-variables' and +the variables `reftex-texpath-environment-variables' and `reftex-bibpath-environment-variables' will be ignored." :group 'reftex-finding-files :type 'boolean) @@ -1679,7 +1679,7 @@ (defcustom reftex-save-parse-info nil "*Non-nil means, save information gathered with parsing in a file. The file MASTER.rel in the same directory as MASTER.tex is used to save the -information. When this variable is t, +information. When this variable is t, - accessing the parsing information for the first time in an editing session will read that file (if available) instead of parsing the document. - exiting Emacs or killing a buffer in reftex-mode will cause a new version @@ -1753,7 +1753,7 @@ highlighted. This is the entry most keys in the selction and *toc* buffers act on. However, if you mainly use the mouse to select an item, you may find it nice to have mouse-triggered highlighting -instead or as well. The variable may have one of these values: +instead or as well. The variable may have one of these values: nil No highlighting. cursor Highlighting is cursor driven. @@ -1882,7 +1882,7 @@ may require a restart of Emacs in order to become effective." :group 'reftex-miscellaneous-configurations :group 'LaTeX - :type '(choice + :type '(choice (const :tag "No plug-ins" nil) (const :tag "All possible plug-ins" t) (list
--- a/lisp/url/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/url/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,14 @@ +2010-03-24 Teodor Zlatanov <tzz@lifelogs.com> + + * url-http.el (url-http-parse-headers): Fix wrong variable name. + +2010-03-24 Teodor Zlatanov <tzz@lifelogs.com> + + * url-http.el (url-http-codes): New variable to hold a mapping of + HTTP status codes' numbers, their symbolic name, and their text. + (url-http-parse-headers): Use it, leaving the original numeric + code in a comment. + 2010-03-19 Glenn Morris <rgm@gnu.org> * url.el: Move mailcap require earlier in the file.
--- a/lisp/url/url-http.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/url/url-http.el Fri Mar 26 15:03:20 2010 +0000 @@ -64,6 +64,55 @@ nil will explicitly close the connection to the server after every request.") +(defconst url-http-codes + '((100 continue "Continue with request") + (101 switching-protocols "Switching protocols") + (102 processing "Processing (Added by DAV)") + (200 OK "OK") + (201 created "Created") + (202 accepted "Accepted") + (203 non-authoritative "Non-authoritative information") + (204 no-content "No content") + (205 reset-content "Reset content") + (206 partial-content "Partial content") + (207 multi-status "Multi-status (Added by DAV)") + (300 multiple-choices "Multiple choices") + (301 moved-permanently "Moved permanently") + (302 found "Found") + (303 see-other "See other") + (304 not-modified "Not modified") + (305 use-proxy "Use proxy") + (307 temporary-redirect "Temporary redirect") + (400 bad-request "Bad Request") + (401 unauthorized "Unauthorized") + (402 payment-required "Payment required") + (403 forbidden "Forbidden") + (404 not-found "Not found") + (405 method-not-allowed "Method not allowed") + (406 not-acceptable "Not acceptable") + (407 proxy-authentication-required "Proxy authentication required") + (408 request-timeout "Request time-out") + (409 conflict "Conflict") + (410 gone "Gone") + (411 length-required "Length required") + (412 precondition-failed "Precondition failed") + (413 request-entity-too-large "Request entity too large") + (414 request-uri-too-large "Request-URI too large") + (415 unsupported-media-type "Unsupported media type") + (416 requested-range-not-satisfiable "Requested range not satisfiable") + (417 expectation-failed "Expectation failed") + (422 unprocessable-entity "Unprocessable Entity (Added by DAV)") + (423 locked "Locked") + (424 failed-Dependency "Failed Dependency") + (500 internal-server-error "Internal server error") + (501 not-implemented "Not implemented") + (502 bad-gateway "Bad gateway") + (503 service-unavailable "Service unavailable") + (504 gateway-timeout "Gateway time-out") + (505 http-version-not-supported "HTTP version not supported") + (507 insufficient-storage "Insufficient storage") +"The HTTP return codes and their text.")) + ;(eval-when-compile ;; These are all macros so that they are hidden from external sight ;; when the file is byte-compiled. @@ -435,7 +484,9 @@ (delete-process url-http-process))))) (let ((buffer (current-buffer)) (class nil) - (success nil)) + (success nil) + ;; other status symbols: jewelry and luxury cars + (status-symbol (cadr (assq url-http-response-status url-http-codes)))) (setq class (/ url-http-response-status 100)) (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status) (url-http-handle-cookies) @@ -463,8 +514,8 @@ ;; 205 Reset content ;; 206 Partial content ;; 207 Multi-status (Added by DAV) - (case url-http-response-status - ((204 205) + (case status-symbol + ((no-content reset-content) ;; No new data, just stay at the same document (url-mark-buffer-as-dead buffer) (setq success t)) @@ -485,8 +536,8 @@ ;; 307 Temporary redirect (let ((redirect-uri (or (mail-fetch-field "Location") (mail-fetch-field "URI")))) - (case url-http-response-status - (300 + (case status-symbol + (multiple-choices ; 300 ;; Quoth the spec (section 10.3.1) ;; ------------------------------- ;; The requested resource corresponds to any one of a set of @@ -503,7 +554,7 @@ ;; We do not support agent-driven negotiation, so we just ;; redirect to the preferred URI if one is provided. nil) - ((301 302 307) + ((moved-permanently found temporary-redirect) ; 301 302 307 ;; If the 301|302 status code is received in response to a ;; request other than GET or HEAD, the user agent MUST NOT ;; automatically redirect the request unless it can be @@ -519,20 +570,20 @@ url-http-method url-http-response-status) (setq url-http-method "GET" url-http-data nil))) - (303 + (see-other ; 303 ;; The response to the request can be found under a different ;; URI and SHOULD be retrieved using a GET method on that ;; resource. (setq url-http-method "GET" url-http-data nil)) - (304 + (not-modified ; 304 ;; The 304 response MUST NOT contain a message-body. (url-http-debug "Extracting document from cache... (%s)" (url-cache-create-filename (url-view-url t))) (url-cache-extract (url-cache-create-filename (url-view-url t))) (setq redirect-uri nil success t)) - (305 + (use-proxy ; 305 ;; The requested resource MUST be accessed through the ;; proxy given by the Location field. The Location field ;; gives the URI of the proxy. The recipient is expected @@ -620,51 +671,51 @@ ;; 422 Unprocessable Entity (Added by DAV) ;; 423 Locked ;; 424 Failed Dependency - (case url-http-response-status - (401 + (case status-symbol + (unauthorized ; 401 ;; The request requires user authentication. The response ;; MUST include a WWW-Authenticate header field containing a ;; challenge applicable to the requested resource. The ;; client MAY repeat the request with a suitable ;; Authorization header field. (url-http-handle-authentication nil)) - (402 + (payment-required ; 402 ;; This code is reserved for future use (url-mark-buffer-as-dead buffer) (error "Somebody wants you to give them money")) - (403 + (forbidden ; 403 ;; The server understood the request, but is refusing to ;; fulfill it. Authorization will not help and the request ;; SHOULD NOT be repeated. (setq success t)) - (404 + (not-found ; 404 ;; Not found (setq success t)) - (405 + (method-not-allowed ; 405 ;; The method specified in the Request-Line is not allowed ;; for the resource identified by the Request-URI. The ;; response MUST include an Allow header containing a list of ;; valid methods for the requested resource. (setq success t)) - (406 + (not-acceptable ; 406 ;; The resource identified by the request is only capable of ;; generating response entities which have content ;; characteristics nota cceptable according to the accept ;; headers sent in the request. (setq success t)) - (407 + (proxy-authentication-required ; 407 ;; This code is similar to 401 (Unauthorized), but indicates ;; that the client must first authenticate itself with the ;; proxy. The proxy MUST return a Proxy-Authenticate header ;; field containing a challenge applicable to the proxy for ;; the requested resource. (url-http-handle-authentication t)) - (408 + (request-timeout ; 408 ;; The client did not produce a request within the time that ;; the server was prepared to wait. The client MAY repeat ;; the request without modifications at any later time. (setq success t)) - (409 + (conflict ; 409 ;; The request could not be completed due to a conflict with ;; the current state of the resource. This code is only ;; allowed in situations where it is expected that the user @@ -673,11 +724,11 @@ ;; information for the user to recognize the source of the ;; conflict. (setq success t)) - (410 + (gone ; 410 ;; The requested resource is no longer available at the ;; server and no forwarding address is known. (setq success t)) - (411 + (length-required ; 411 ;; The server refuses to accept the request without a defined ;; Content-Length. The client MAY repeat the request if it ;; adds a valid Content-Length header field containing the @@ -687,29 +738,29 @@ ;; `url-http-create-request' automatically calculates the ;; content-length. (setq success t)) - (412 + (precondition-failed ; 412 ;; The precondition given in one or more of the ;; request-header fields evaluated to false when it was ;; tested on the server. (setq success t)) - ((413 414) + ((request-entity-too-large request-uri-too-large) ; 413 414 ;; The server is refusing to process a request because the ;; request entity|URI is larger than the server is willing or ;; able to process. (setq success t)) - (415 + (unsupported-media-type ; 415 ;; The server is refusing to service the request because the ;; entity of the request is in a format not supported by the ;; requested resource for the requested method. (setq success t)) - (416 + (requested-range-not-satisfiable ; 416 ;; A server SHOULD return a response with this status code if ;; a request included a Range request-header field, and none ;; of the range-specifier values in this field overlap the ;; current extent of the selected resource, and the request ;; did not include an If-Range request-header field. (setq success t)) - (417 + (expectation-failed ; 417 ;; The expectation given in an Expect request-header field ;; could not be met by this server, or, if the server is a ;; proxy, the server has unambiguous evidence that the @@ -736,16 +787,16 @@ ;; 507 Insufficient storage (setq success t) (case url-http-response-status - (501 + (not-implemented ; 501 ;; The server does not support the functionality required to ;; fulfill the request. nil) - (502 + (bad-gateway ; 502 ;; The server, while acting as a gateway or proxy, received ;; an invalid response from the upstream server it accessed ;; in attempting to fulfill the request. nil) - (503 + (service-unavailable ; 503 ;; The server is currently unable to handle the request due ;; to a temporary overloading or maintenance of the server. ;; The implication is that this is a temporary condition @@ -754,19 +805,19 @@ ;; header. If no Retry-After is given, the client SHOULD ;; handle the response as it would for a 500 response. nil) - (504 + (gateway-timeout ; 504 ;; The server, while acting as a gateway or proxy, did not ;; receive a timely response from the upstream server ;; specified by the URI (e.g. HTTP, FTP, LDAP) or some other ;; auxiliary server (e.g. DNS) it needed to access in ;; attempting to complete the request. nil) - (505 + (http-version-not-supported ; 505 ;; The server does not support, or refuses to support, the ;; HTTP protocol version that was used in the request ;; message. nil) - (507 ; DAV + (insufficient-storage ; 507 (DAV) ;; The method could not be performed on the resource ;; because the server is unable to store the representation ;; needed to successfully complete the request. This
--- a/lisp/vc-bzr.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/vc-bzr.el Fri Mar 26 15:03:20 2010 +0000 @@ -545,6 +545,7 @@ (goto-char (point-min))) found))) +(declare-function log-edit-mode "log-edit" ()) (defvar log-edit-extra-flags) (defvar log-edit-before-checkin-process) @@ -552,12 +553,14 @@ "Mode for editing Bzr commit logs. If a line like: Author: NAME -is present in the log, it is removed, and +is present in the log, it is removed, and --author NAME -is passed to the bzr commit command." +is passed to the bzr commit command. Similarly with Fixes: and --fixes." (set (make-local-variable 'log-edit-extra-flags) nil) (set (make-local-variable 'log-edit-before-checkin-process) - '(("^Author:[ \t]+\\(.*\\)[ \t]*$" . (list "--author" (match-string 1)))))) + '(("^\\(Author\\|Fixes\\):[ \t]+\\(.*\\)[ \t]*$" . + (list (format "--%s" (downcase (match-string 1))) + (match-string 2)))))) (defun vc-bzr-diff (files &optional rev1 rev2 buffer) "VC bzr backend for diff."
--- a/lisp/vc-dir.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/vc-dir.el Fri Mar 26 15:03:20 2010 +0000 @@ -950,7 +950,8 @@ (propertize "VC backend : " 'face 'font-lock-type-face) (propertize (format "%s\n" backend) 'face 'font-lock-variable-name-face) (propertize "Working dir: " 'face 'font-lock-type-face) - (propertize (format "%s\n" dir) 'face 'font-lock-variable-name-face) + (propertize (format "%s\n" (abbreviate-file-name dir)) + 'face 'font-lock-variable-name-face) ;; Then the backend specific ones. (vc-call-backend backend 'dir-extra-headers dir) "\n"))
--- a/lisp/vc-dispatcher.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/vc-dispatcher.el Fri Mar 26 15:03:20 2010 +0000 @@ -539,8 +539,9 @@ INITIAL-CONTENTS is nil, do action immediately as if the user had entered COMMENT. If COMMENT is t, also do action immediately with an empty comment. Remember the file's buffer in `vc-parent-buffer' -\(current one if no file). AFTER-HOOK specifies the local value -for `vc-log-after-operation-hook'." +\(current one if no file). Puts the log-entry buffer in major-mode +MODE, defaulting to `log-edit-mode' if MODE is nil. +AFTER-HOOK specifies the local value for `vc-log-after-operation-hook'." (let ((parent (if (vc-dispatcher-browsing) ;; If we are called from a directory browser, the parent buffer is @@ -569,6 +570,9 @@ (vc-finish-logentry (eq comment t))))) (declare-function vc-dir-move-to-goal-column "vc-dir" ()) +;; vc-finish-logentry is called from a log-edit buffer (see above). +(declare-function log-view-process-buffer "log-edit" ()) +(defvar log-edit-extra-flags) (defun vc-finish-logentry (&optional nocomment) "Complete the operation implied by the current log entry.
--- a/lisp/vc-hg.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/vc-hg.el Fri Mar 26 15:03:20 2010 +0000 @@ -279,6 +279,7 @@ ("^date: \\(.+\\)" (1 'change-log-date)) ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) +(declare-function log-edit-mode "log-edit" ()) (defvar log-edit-extra-flags) (defvar log-edit-before-checkin-process) @@ -286,7 +287,7 @@ "Mode for editing Hg commit logs. If a line like: Author: NAME -is present in the log, it is removed, and +is present in the log, it is removed, and --author NAME is passed to the hg commit command." (set (make-local-variable 'log-edit-extra-flags) nil)
--- a/lisp/vc.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/vc.el Fri Mar 26 15:03:20 2010 +0000 @@ -1744,17 +1744,18 @@ (defun vc-modify-change-comment (files rev oldcomment) "Edit the comment associated with the given files and revision." - (vc-start-logentry - files rev oldcomment t - "Enter a replacement change comment." - "*VC-log*" - (lambda (files rev comment ignored) - (vc-call-backend - ;; Less of a kluge than it looks like; log-view mode only passes - ;; this function a singleton list. Arguments left in this form in - ;; case the more general operation ever becomes meaningful. - (vc-responsible-backend (car files)) - 'modify-change-comment files rev comment)))) + ;; Less of a kluge than it looks like; log-view mode only passes + ;; this function a singleton list. Arguments left in this form in + ;; case the more general operation ever becomes meaningful. + (let ((backend (vc-responsible-backend (car files)))) + (vc-start-logentry + files rev oldcomment t + "Enter a replacement change comment." + "*VC-log*" + (lambda () (vc-call-backend backend 'log-edit-mode)) + (lambda (files rev comment ignored) + (vc-call-backend backend + 'modify-change-comment files rev comment))))) ;;;###autoload (defun vc-merge () @@ -2433,6 +2434,8 @@ (defalias 'vc-default-check-headers 'ignore) +(declare-function log-edit-mode "log-edit" ()) + (defun vc-default-log-edit-mode (backend) (log-edit-mode)) (defun vc-default-log-view-mode (backend) (log-view-mode))
--- a/lisp/woman.el Mon Mar 22 10:47:09 2010 +0000 +++ b/lisp/woman.el Fri Mar 26 15:03:20 2010 +0000 @@ -3876,10 +3876,14 @@ ;; The first two cases below could be merged (maybe)! (let ((from (point))) ;; Discard zero width filler character used to hide leading dots - ;; and zero width characters. If on a line by itself, consume the - ;; newline as well, as this may interfere with (Bug#3651). - (while (re-search-forward "\\\\[&|^]\n?" to t) - (woman-delete-match 0)) + ;; and zero width characters. + (while (re-search-forward "\\\\[&|^]" to t) + (woman-delete-match 0) + ;; If on a line by itself, consume newline as well (Bug#3651). + (and (eq (char-before (match-beginning 0)) ?\n) + (eq (char-after (match-beginning 0)) ?\n) + (delete-char 1))) + (goto-char from) ;; Interrupt text processing -- CONTINUE current text with the ;; next text line (after any control lines, unless processing to
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist Mon Mar 22 10:47:09 2010 +0000 +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist Fri Mar 26 15:03:20 2010 +0000 @@ -1,5 +1,5 @@ <!-- -Copyright (C) 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs.
--- a/src/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/src/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,5 +1,64 @@ +2010-03-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * process.c (Fmake_network_process): Don't call turn_on_atimers around + `connect' (Bug#5723). + +2010-03-25 Helmut Eller <eller.helmut@gmail.com> + + * process.c (Fmake_network_process): Call `select' for interrupted + `connect' rather than creating new socket (Bug#5173). + +2010-03-24 Jan Djärv <jan.h.d@swipnet.se> + + * frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736). + + * xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER. + + * dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new. + +2010-03-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around + XLoadQueryFont. + +2010-03-24 Kenichi Handa <handa@m17n.org> + + * coding.c (decode_coding_ccl): Fix previous change for the + multibyte case. + (encode_coding_ccl): Don't setup ccl program here. Fix for the + case that the output buffer is fullfilled. + (encode_coding): Setup ccl program here. + +2010-03-24 Andreas Politz <politza@fh-trier.de> (tiny change) + + * editfns.c (Fformat): Account for string precision when computing + field width (Bug#5710). + +2010-03-23 Dan Nicolaescu <dann@ics.uci.edu> + + * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default. + + Simplify LIBS_MACHINE definitions. + * m/hp800.h (LIBS_MACHINE): Remove, same as default. + * m/iris4d.h (LIBS_MACHINE): Likewise. + * m/ibmrs6000.h (LIBS_MACHINE): Rename to LIBS_SYSTEM and move ... + * s/aix4-2.h (LIBS_SYSTEM): ... here. + * s/netbsd.h: Remove commented out code. + 2010-03-22 Dan Nicolaescu <dann@ics.uci.edu> + Remove dead code dealing with POSIX_SIGNALS. + * atimer.c (set_alarm): Remove dead code, all USG systems define + POSIX_SIGNALS. + * data.c (arith_error): Likewise. + * keyboard.c (input_available_signal, handle_user_signal) + (interrupt_signal): Likewise. + * process.c (sigchld_handler): Likewise. + (create_process): Remove if 0 code. Remove HPUX conditional when + !defined (POSIX_SIGNALS), it cannot be true. + * syssignal.h: Remove USG5_4 and USG conditionals when + !POSIX_SIGNALS, they cannot be true. + * keyboard.c (Fset_input_interrupt_mode): Remove code depending on NO_SOCK_SIGIO, not used anymore.
--- a/src/ChangeLog.7 Mon Mar 22 10:47:09 2010 +0000 +++ b/src/ChangeLog.7 Fri Mar 26 15:03:20 2010 +0000 @@ -7154,9 +7154,9 @@ (ENCODE_ISO_CHARACTER): Bug of handling return value of unify_char fixed. (DECODE_SJIS_BIG5_CHARACTER): New macro. - (decode_coding_sjis_big5): Handle character unificatoin table. + (decode_coding_sjis_big5): Handle character unification table. Use macro DECODE_SJIS_BIG5_CHARACTER. - (encode_coding_sjis_big5): Handle character unificatoin table. + (encode_coding_sjis_big5): Handle character unification table. Use macro ENCODE_SJIS_BIG5_CHARACTER. (setup_coding_system): Handle members character_unification_table_for_decode and
--- a/src/atimer.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/atimer.c Fri Mar 26 15:03:20 2010 +0000 @@ -296,12 +296,6 @@ static void set_alarm () { -#if defined (USG) && !defined (POSIX_SIGNALS) - /* USG systems forget handlers when they are used; - must reestablish each time. */ - signal (SIGALRM, alarm_signal_handler); -#endif /* USG */ - if (atimers) { EMACS_TIME now, time;
--- a/src/coding.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/coding.c Fri Mar 26 15:03:20 2010 +0000 @@ -5245,7 +5245,7 @@ int multibytep = coding->src_multibyte; struct ccl_program *ccl = &coding->spec.ccl->ccl; int source_charbuf[1024]; - int source_byteidx[1024]; + int source_byteidx[1025]; Lisp_Object attrs, charset_list; CODING_GET_INFO (coding, attrs, charset_list); @@ -5256,11 +5256,14 @@ int i = 0; if (multibytep) - while (i < 1024 && p < src_end) - { - source_byteidx[i] = p - src; - source_charbuf[i++] = STRING_CHAR_ADVANCE (p); - } + { + while (i < 1024 && p < src_end) + { + source_byteidx[i] = p - src; + source_charbuf[i++] = STRING_CHAR_ADVANCE (p); + } + source_byteidx[i] = p - src; + } else while (i < 1024 && p < src_end) source_charbuf[i++] = *p++; @@ -5270,7 +5273,7 @@ ccl_driver (ccl, source_charbuf, charbuf, i, charbuf_end - charbuf, charset_list); charbuf += ccl->produced; - if (multibytep && ccl->consumed < i) + if (multibytep) src += source_byteidx[ccl->consumed]; else src += ccl->consumed; @@ -5304,7 +5307,7 @@ encode_coding_ccl (coding) struct coding_system *coding; { - struct ccl_program ccl; + struct ccl_program *ccl = &coding->spec.ccl->ccl; int multibytep = coding->dst_multibyte; int *charbuf = coding->charbuf; int *charbuf_end = charbuf + coding->charbuf_used; @@ -5315,35 +5318,34 @@ Lisp_Object attrs, charset_list; CODING_GET_INFO (coding, attrs, charset_list); - setup_ccl_program (&ccl, CODING_CCL_ENCODER (coding)); - - ccl.last_block = coding->mode & CODING_MODE_LAST_BLOCK; - ccl.dst_multibyte = coding->dst_multibyte; + if (coding->consumed_char == coding->src_chars + && coding->mode & CODING_MODE_LAST_BLOCK) + ccl->last_block = 1; while (charbuf < charbuf_end) { - ccl_driver (&ccl, charbuf, destination_charbuf, + ccl_driver (ccl, charbuf, destination_charbuf, charbuf_end - charbuf, 1024, charset_list); if (multibytep) { - ASSURE_DESTINATION (ccl.produced * 2); - for (i = 0; i < ccl.produced; i++) + ASSURE_DESTINATION (ccl->produced * 2); + for (i = 0; i < ccl->produced; i++) EMIT_ONE_BYTE (destination_charbuf[i] & 0xFF); } else { - ASSURE_DESTINATION (ccl.produced); - for (i = 0; i < ccl.produced; i++) + ASSURE_DESTINATION (ccl->produced); + for (i = 0; i < ccl->produced; i++) *dst++ = destination_charbuf[i] & 0xFF; - produced_chars += ccl.produced; - } - charbuf += ccl.consumed; - if (ccl.status == CCL_STAT_QUIT - || ccl.status == CCL_STAT_INVALID_CMD) + produced_chars += ccl->produced; + } + charbuf += ccl->consumed; + if (ccl->status == CCL_STAT_QUIT + || ccl->status == CCL_STAT_INVALID_CMD) break; } - switch (ccl.status) + switch (ccl->status) { case CCL_STAT_SUSPEND_BY_SRC: record_conversion_result (coding, CODING_RESULT_INSUFFICIENT_SRC); @@ -7534,6 +7536,7 @@ Lisp_Object attrs; Lisp_Object translation_table; int max_lookup; + struct ccl_spec cclspec; attrs = CODING_ID_ATTRS (coding->id); if (coding->encoder == encode_coding_raw_text) @@ -7555,6 +7558,11 @@ ALLOC_CONVERSION_WORK_AREA (coding); + if (coding->encoder == encode_coding_ccl) + { + coding->spec.ccl = &cclspec; + setup_ccl_program (&cclspec.ccl, CODING_CCL_ENCODER (coding)); + } do { coding_set_source (coding); consume_chars (coding, translation_table, max_lookup);
--- a/src/config.in Mon Mar 22 10:47:09 2010 +0000 +++ b/src/config.in Fri Mar 26 15:03:20 2010 +0000 @@ -318,10 +318,10 @@ /* Define to 1 if you have the <kerberos/krb.h> header file. */ #undef HAVE_KERBEROS_KRB_H -/* Define to 1 if `e_text' is member of `krb5_error'. */ +/* Define to 1 if `e_text' is a member of `krb5_error'. */ #undef HAVE_KRB5_ERROR_E_TEXT -/* Define to 1 if `text' is member of `krb5_error'. */ +/* Define to 1 if `text' is a member of `krb5_error'. */ #undef HAVE_KRB5_ERROR_TEXT /* Define to 1 if you have the <krb5.h> header file. */ @@ -615,25 +615,25 @@ /* Define to 1 if you have the `strsignal' function. */ #undef HAVE_STRSIGNAL -/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */ +/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_ADDR -/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */ +/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR -/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */ +/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_FLAGS -/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */ +/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_HWADDR -/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */ +/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_NETMASK -/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ +/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */ #undef HAVE_STRUCT_NLIST_N_UN_N_NAME -/* Define to 1 if `tm_zone' is member of `struct tm'. */ +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */ @@ -860,6 +860,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -919,6 +922,28 @@ /* Define to 1 if using the Motif X toolkit. */ #undef USE_MOTIF +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Define to 1 if we should use toolkit scroll bars. */ #undef USE_TOOLKIT_SCROLL_BARS @@ -954,28 +979,6 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #undef __GETOPT_PREFIX
--- a/src/data.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/data.c Fri Mar 26 15:03:20 2010 +0000 @@ -3291,11 +3291,6 @@ arith_error (signo) int signo; { -#if defined(USG) && !defined(POSIX_SIGNALS) - /* USG systems forget handlers when they are used; - must reestablish each time */ - signal (signo, arith_error); -#endif /* USG */ sigsetmask (SIGEMPTYMASK); SIGNAL_THREAD_CHECK (signo);
--- a/src/dispextern.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/dispextern.h Fri Mar 26 15:03:20 2010 +0000 @@ -3122,7 +3122,8 @@ RES_TYPE_FLOAT, RES_TYPE_BOOLEAN, RES_TYPE_STRING, - RES_TYPE_SYMBOL + RES_TYPE_SYMBOL, + RES_TYPE_BOOLEAN_NUMBER }; extern Lisp_Object x_get_arg P_ ((Display_Info *, Lisp_Object,
--- a/src/frame.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/frame.c Fri Mar 26 15:03:20 2010 +0000 @@ -4005,6 +4005,13 @@ case RES_TYPE_NUMBER: return make_number (atoi (SDATA (tem))); + case RES_TYPE_BOOLEAN_NUMBER: + if (!strcmp (SDATA (tem), "on") + || !strcmp (SDATA (tem), "true")) + return make_number (1); + return make_number (atoi (SDATA (tem))); + break; + case RES_TYPE_FLOAT: return make_float (atof (SDATA (tem)));
--- a/src/keyboard.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/keyboard.c Fri Mar 26 15:03:20 2010 +0000 @@ -7507,12 +7507,6 @@ { /* Must preserve main program's value of errno. */ int old_errno = errno; -#if defined (USG) && !defined (POSIX_SIGNALS) - /* USG systems forget handlers when they are used; - must reestablish each time */ - signal (signo, input_available_signal); -#endif /* USG */ - SIGNAL_THREAD_CHECK (signo); #ifdef SYNC_INPUT @@ -7595,12 +7589,6 @@ int old_errno = errno; struct user_signal_info *p; -#if defined (USG) && !defined (POSIX_SIGNALS) - /* USG systems forget handlers when they are used; - must reestablish each time */ - signal (sig, handle_user_signal); -#endif - SIGNAL_THREAD_CHECK (sig); for (p = user_signals; p; p = p->next) @@ -11089,13 +11077,6 @@ int old_errno = errno; struct terminal *terminal; -#if defined (USG) && !defined (POSIX_SIGNALS) - /* USG systems forget handlers when they are used; - must reestablish each time */ - signal (SIGINT, interrupt_signal); - signal (SIGQUIT, interrupt_signal); -#endif /* USG */ - SIGNAL_THREAD_CHECK (signalnum); /* See if we have an active terminal on our controlling tty. */
--- a/src/m/hp800.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/m/hp800.h Fri Mar 26 15:03:20 2010 +0000 @@ -93,7 +93,6 @@ #define UNEXEC unexhp9k800.o -#define LIBS_MACHINE #define LIBS_DEBUG /* Include the file bsdtty.h, since this machine has job control. */
--- a/src/m/ibmrs6000.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/m/ibmrs6000.h Fri Mar 26 15:03:20 2010 +0000 @@ -57,15 +57,6 @@ #define NLIST_STRUCT #endif -/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless - on older versions of X where it happens to exist. */ -#ifdef HAVE_LIBPTHREADS -#define LIBS_MACHINE -lrts -lIM -liconv -lpthreads -#else -/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2. */ -#define LIBS_MACHINE -lrts -lIM -liconv -#endif - #undef ADDR_CORRECT #define ADDR_CORRECT(x) ((int)(x))
--- a/src/m/iris4d.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/m/iris4d.h Fri Mar 26 15:03:20 2010 +0000 @@ -53,8 +53,6 @@ #define DATA_START 0x10000000 #define DATA_SEG_BITS 0x10000000 -#undef LIBS_MACHINE -#define LIBS_MACHINE #define LIBS_DEBUG /* Use terminfo instead of termcap. */
--- a/src/process.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/process.c Fri Mar 26 15:03:20 2010 +0000 @@ -1878,13 +1878,7 @@ #ifdef AIX struct sigaction sighup_action; #endif -#else /* !POSIX_SIGNALS */ -#if 0 -#ifdef SIGCHLD - SIGTYPE (*sigchld)(); -#endif -#endif /* 0 */ -#endif /* !POSIX_SIGNALS */ +#endif /* POSIX_SIGNALS */ /* Use volatile to protect variables from being clobbered by longjmp. */ volatile int forkin, forkout; volatile int pty_flag = 0; @@ -2008,14 +2002,9 @@ sigprocmask (SIG_BLOCK, &blocked, &procmask); #else /* !POSIX_SIGNALS */ #ifdef SIGCHLD -#if defined (BSD_SYSTEM) || defined (HPUX) +#if defined (BSD_SYSTEM) sigsetmask (sigmask (SIGCHLD)); -#else /* ordinary USG */ -#if 0 - sigchld_deferred = 0; - sigchld = signal (SIGCHLD, create_process_sigchld); -#endif -#endif /* ordinary USG */ +#endif /* BSD_SYSTEM */ #endif /* SIGCHLD */ #endif /* !POSIX_SIGNALS */ @@ -2172,13 +2161,9 @@ sigprocmask (SIG_SETMASK, &procmask, 0); #else /* !POSIX_SIGNALS */ #ifdef SIGCHLD -#if defined (BSD_SYSTEM) || defined (HPUX) +#if defined (BSD_SYSTEM) sigsetmask (SIGEMPTYMASK); -#else /* ordinary USG */ -#if 0 - signal (SIGCHLD, sigchld); -#endif -#endif /* ordinary USG */ +#endif /* BSD_SYSTEM */ #endif /* SIGCHLD */ #endif /* !POSIX_SIGNALS */ @@ -2275,17 +2260,9 @@ sigprocmask (SIG_SETMASK, &procmask, 0); #else /* !POSIX_SIGNALS */ #ifdef SIGCHLD -#if defined (BSD_SYSTEM) || defined (HPUX) +#if defined (BSD_SYSTEM) sigsetmask (SIGEMPTYMASK); -#else /* ordinary USG */ -#if 0 - signal (SIGCHLD, sigchld); - /* Now really handle any of these signals - that came in during this function. */ - if (sigchld_deferred) - kill (getpid (), SIGCHLD); -#endif -#endif /* ordinary USG */ +#endif /* BSD_SYSTEM */ #endif /* SIGCHLD */ #endif /* !POSIX_SIGNALS */ @@ -3557,8 +3534,6 @@ { int optn, optbits; - retry_connect: - s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol); if (s < 0) { @@ -3640,23 +3615,9 @@ immediate_quit = 1; QUIT; - /* This turns off all alarm-based interrupts; the - bind_polling_period call above doesn't always turn all the - short-interval ones off, especially if interrupt_input is - set. - - It'd be nice to be able to control the connect timeout - though. Would non-blocking connect calls be portable? - - This used to be conditioned by HAVE_GETADDRINFO. Why? */ - - turn_on_atimers (0); - ret = connect (s, lres->ai_addr, lres->ai_addrlen); xerrno = errno; - turn_on_atimers (1); - if (ret == 0 || xerrno == EISCONN) { /* The unwind-protect will be discarded afterwards. @@ -3675,6 +3636,38 @@ #endif #endif #endif + if (xerrno == EINTR) + { + /* Unlike most other syscalls connect() cannot be called + again. (That would return EALREADY.) The proper way to + wait for completion is select(). */ + int sc; + SELECT_TYPE fdset; + retry_select: + FD_ZERO (&fdset); + FD_SET (s, &fdset); + QUIT; + sc = select (s + 1, (SELECT_TYPE *)0, &fdset, (SELECT_TYPE *)0, + (EMACS_TIME *)0); + if (sc == -1) + { + if (errno == EINTR) + goto retry_select; + else + report_file_error ("select failed", Qnil); + } + eassert (sc > 0); + { + int len = sizeof xerrno; + eassert (FD_ISSET (s, &fdset)); + if (getsockopt (s, SOL_SOCKET, SO_ERROR, &xerrno, &len) == -1) + report_file_error ("getsockopt failed", Qnil); + if (xerrno != 0) + errno = xerrno, report_file_error ("error during connect", Qnil); + else + break; + } + } immediate_quit = 0; @@ -3682,9 +3675,6 @@ specpdl_ptr = specpdl + count1; emacs_close (s); s = -1; - - if (xerrno == EINTR) - goto retry_connect; } if (s >= 0) @@ -6704,11 +6694,6 @@ /* PID == 0 means no processes found, PID == -1 means a real failure. We have done all our job, so return. */ - /* USG systems forget handlers when they are used; - must reestablish each time */ -#if defined (USG) && !defined (POSIX_SIGNALS) - signal (signo, sigchld_handler); /* WARNING - must come after wait3() */ -#endif errno = old_errno; return; } @@ -6809,9 +6794,6 @@ #if (defined WINDOWSNT \ || (defined USG && !defined GNU_LINUX \ && !(defined HPUX && defined WNOHANG))) -#if defined (USG) && ! defined (POSIX_SIGNALS) - signal (signo, sigchld_handler); -#endif errno = old_errno; return; #endif /* USG, but not HPUX with WNOHANG */
--- a/src/s/aix4-2.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/s/aix4-2.h Fri Mar 26 15:03:20 2010 +0000 @@ -95,6 +95,15 @@ #define LIB_STANDARD +/* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless + on older versions of X where it happens to exist. */ +#ifdef HAVE_LIBPTHREADS +#define LIBS_SYSTEM -lrts -lIM -liconv -lpthreads +#else +/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2. */ +#define LIBS_SYSTEM -lrts -lIM -liconv +#endif + /* Use terminfo instead of termcap. */ #define TERMINFO
--- a/src/s/gnu-linux.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/s/gnu-linux.h Fri Mar 26 15:03:20 2010 +0000 @@ -207,9 +207,6 @@ #define C_DEBUG_SWITCH #endif -/* alane@wozzle.linet.org says that -lipc is not a separate library, - since libc-4.4.1. So -lipc was deleted. */ -#define LIBS_SYSTEM /* _BSD_SOURCE is redundant, at least in glibc2, since we define _GNU_SOURCE. Left in in case it's relevant to libc5 systems and anyone's still using Emacs on those. --fx 2002-12-14 */
--- a/src/s/netbsd.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/s/netbsd.h Fri Mar 26 15:03:20 2010 +0000 @@ -26,8 +26,6 @@ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -/* -lutil is not needed for NetBSD >0.9. */ -/* #define LIBS_SYSTEM -lutil */ #define LIBS_TERMCAP -ltermcap #define NEED_ERRNO
--- a/src/syssignal.h Mon Mar 22 10:47:09 2010 +0000 +++ b/src/syssignal.h Fri Mar 26 15:03:20 2010 +0000 @@ -88,38 +88,12 @@ #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG) #else /* ! defined (POSIX_SIGNALS) */ -#ifdef USG5_4 - -extern SIGMASKTYPE sigprocmask_set; - -#ifndef sigblock -#define sigblock(sig) \ - (sigprocmask_set = SIGEMPTYMASK | (sig), \ - sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL)) -#endif - -#ifndef sigunblock -#define sigunblock(sig) \ - (sigprocmask_set = SIGFULLMASK & ~(sig), \ - sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL)) -#endif - -#else -#ifdef USG - -#ifndef sigunblock -#define sigunblock(sig) -#endif - -#else #ifndef sigunblock #define sigunblock(SIG) \ { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); } #endif -#endif /* ! defined (USG) */ -#endif /* ! defined (USG5_4) */ #endif /* ! defined (POSIX_SIGNALS) */ #ifndef SIGMASKTYPE
--- a/src/xfns.c Mon Mar 22 10:47:09 2010 +0000 +++ b/src/xfns.c Fri Mar 26 15:03:20 2010 +0000 @@ -3347,7 +3347,9 @@ #ifdef USE_LUCID /* Prevent lwlib/xlwmenu.c from crashing because of a bug whereby it fails to get any font. */ + BLOCK_INPUT; xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed"); + UNBLOCK_INPUT; #endif /* Frame contents get displaced if an embedded X window has a border. */ @@ -3421,7 +3423,7 @@ init_frame_faces (f); x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), - "menuBar", "MenuBar", RES_TYPE_NUMBER); + "menuBar", "MenuBar", RES_TYPE_BOOLEAN_NUMBER); x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), "toolBar", "ToolBar", RES_TYPE_NUMBER); x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
--- a/test/ChangeLog Mon Mar 22 10:47:09 2010 +0000 +++ b/test/ChangeLog Fri Mar 26 15:03:20 2010 +0000 @@ -1,3 +1,7 @@ +2010-03-23 Juri Linkov <juri@jurta.org> + + * occur-testsuite.el: New file. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.
--- a/test/cedet/tests/testjavacomp.java Mon Mar 22 10:47:09 2010 +0000 +++ b/test/cedet/tests/testjavacomp.java Fri Mar 26 15:03:20 2010 +0000 @@ -1,23 +1,23 @@ /** testjavacomp.java --- * - * Copyright (C) 2009 Eric M. Ludlam + * Copyright (C) 2009, 2010 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <eric@siege-engine.com> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This file is part of GNU Emacs. + * + * GNU Emacs is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNU Emacs is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ package tests.testjavacomp;
--- a/test/cedet/tests/testpolymorph.cpp Mon Mar 22 10:47:09 2010 +0000 +++ b/test/cedet/tests/testpolymorph.cpp Fri Mar 26 15:03:20 2010 +0000 @@ -1,23 +1,23 @@ /** testpolymorph.cpp --- A sequence of polymorphism examples. * - * Copyright (C) 2009 Eric M. Ludlam + * Copyright (C) 2009, 2010 Free Software Foundation, Inc. * * Author: Eric M. Ludlam <eric@siege-engine.com> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2, or (at - * your option) any later version. + * This file is part of GNU Emacs. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * GNU Emacs is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNU Emacs is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <cmath>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/occur-testsuite.el Fri Mar 26 15:03:20 2010 +0000 @@ -0,0 +1,140 @@ +;;; occur-testsuite.el --- Test suite for occur. + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; Author: Juri Linkov <juri@jurta.org> +;; Keywords: matching, internal + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; Type M-x test-occur RET to test the functionality of `occur'. + +;;; Code: + +(defconst occur-tests + '( + ;; * Test one-line matches (at bob, eob, bol, eol). + ("x" 0 "\ +xa +b +cx +xd +xex +fx +" "\ +5 matches for \"x\" in buffer: *temp* + 1:xa + 3:cx + 4:xd + 5:xex + 6:fx +") + ;; * Test multi-line matches, this is the first test from + ;; http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html + ;; where numbers are replaced with letters. + ("a\na" 0 "\ +a +a +a +a +a +" "\ +2 matches for \"a^Ja\" in buffer: *temp* + 1:a + :a + 3:a + :a +") + ;; * Test multi-line matches, this is the second test from + ;; http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html + ;; where numbers are replaced with letters. + ("a\nb" 0 "\ +a +b +c +a +b +" "\ +2 matches for \"a^Jb\" in buffer: *temp* + 1:a + :b + 4:a + :b +") + ;; * Test line numbers for multi-line matches with empty last match line. + ("a\n" 0 "\ +a + +c +a + +" "\ +2 matches for \"a^J\" in buffer: *temp* + 1:a + : + 4:a + : +") + ;; * Test multi-line matches with 3 match lines. + ("x\n.x\n" 0 "\ +ax +bx +c +d +ex +fx +" "\ +2 matches for \"x^J.x^J\" in buffer: *temp* + 1:ax + :bx + :c + 5:ex + :fx + : +") + ) + "List of tests for `occur'. +Each element has the format: +\(REGEXP NLINES INPUT-BUFFER-STRING OUTPUT-BUFFER-STRING).") + +(defun test-occur () + (interactive) + (let ((count 1) + failed + (occur-hook nil)) + (dolist (test occur-tests) + (let ((regexp (nth 0 test)) + (nlines (nth 1 test)) + (input-buffer-string (nth 2 test)) + (output-buffer-string (nth 3 test))) + (save-excursion + (with-temp-buffer + (insert input-buffer-string) + (occur regexp nlines) + (unless (equal output-buffer-string + (with-current-buffer "*Occur*" + (buffer-string))) + (setq failed (cons count failed)))))) + (setq count (1+ count))) + (if failed + (message "FAILED TESTS: %S" (reverse failed)) + (message "SUCCESS")))) + +(provide 'occur-testsuite) + +;;; occur-testsuite.el ends here