Mercurial > emacs
changeset 107660:e6a6d8c247e4
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 24 Mar 2010 06:29:13 +0000 |
| parents | 40292a5708c2 (current diff) daf1d382bc07 (diff) |
| children | 1dc7dbba5184 |
| files | |
| diffstat | 9 files changed, 31 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Tue Mar 23 06:41:07 2010 +0000 +++ b/doc/emacs/ChangeLog Wed Mar 24 06:29:13 2010 +0000 @@ -1,3 +1,8 @@ +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
--- a/doc/emacs/ack.texi Tue Mar 23 06:41:07 2010 +0000 +++ b/doc/emacs/ack.texi Wed Mar 24 06:29:13 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/emacs.texi Tue Mar 23 06:41:07 2010 +0000 +++ b/doc/emacs/emacs.texi Wed Mar 24 06:29:13 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 @@ -1372,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/lispref/ChangeLog Tue Mar 23 06:41:07 2010 +0000 +++ b/doc/lispref/ChangeLog Wed Mar 24 06:29:13 2010 +0000 @@ -1,3 +1,7 @@ +2010-03-24 Arni Magnusson <arnima@hafro.is> (tiny change) + + * frames.texi (Cursor Parameters): Fix typo. (Bug#5760) + 2010-03-21 Chong Yidong <cyd@stupidchicken.com> * processes.texi (Network Processes): Document seqpacket type.
--- a/doc/lispref/frames.texi Tue Mar 23 06:41:07 2010 +0000 +++ b/doc/lispref/frames.texi Wed Mar 24 06:29:13 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/lisp/ChangeLog Tue Mar 23 06:41:07 2010 +0000 +++ b/lisp/ChangeLog Wed Mar 24 06:29:13 2010 +0000 @@ -1,3 +1,10 @@ +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-23 Glenn Morris <rgm@gnu.org> * textmodes/flyspell.el (sgml-lexical-context): Autoload it. (Bug#5752)
--- a/lisp/cedet/srecode/table.el Tue Mar 23 06:41:07 2010 +0000 +++ b/lisp/cedet/srecode/table.el Wed Mar 24 06:29:13 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/faces.el Tue Mar 23 06:41:07 2010 +0000 +++ b/lisp/faces.el Wed Mar 24 06:29:13 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/src/ChangeLog.7 Tue Mar 23 06:41:07 2010 +0000 +++ b/src/ChangeLog.7 Wed Mar 24 06:29:13 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