From 4f103e0430a9c48084d26ab7f100542626c2acc6 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 31 Mar 2010 00:00:23 -0400 Subject: [PATCH 01/11] * nsterm.h: Fix last change. --- src/ChangeLog | 4 ++++ src/nsterm.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index cb80f6f498d..d6bab5bdefc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-03-31 Chong Yidong + + * nsterm.h: Fix last change. + 2010-03-30 Bernhard Herzog (tiny change) * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930). diff --git a/src/nsterm.h b/src/nsterm.h index 01086e63b69..10d1695dc4f 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -709,7 +709,7 @@ extern int ns_lisp_to_cursor_type (); extern Lisp_Object ns_cursor_type_to_lisp (int arg); extern Lisp_Object Qnone; extern void ns_set_name_as_filename (struct frame *f); -extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg); +extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval); extern int ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc, From 4a217bedd4dffb1722401ebd2c5736886e441a0c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 31 Mar 2010 12:08:40 +0300 Subject: [PATCH 02/11] Fix bug #5703. w32fns.c (x_create_tip_frame): Copy `parms' before we modify it in this function. --- src/ChangeLog | 5 +++++ src/w32fns.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index d6bab5bdefc..e5571067d4a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-03-31 Eli Zaretskii + + * w32fns.c (x_create_tip_frame): Copy `parms' before we modify it + in this function. (Bug#5703) + 2010-03-31 Chong Yidong * nsterm.h: Fix last change. diff --git a/src/w32fns.c b/src/w32fns.c index 938bd463b25..795e7208569 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5427,6 +5427,10 @@ x_create_tip_frame (dpyinfo, parms, text) kb = dpyinfo->terminal->kboard; + /* The calls to x_get_arg remove elements from PARMS, so copy it to + avoid destructive changes behind our caller's back. */ + parms = Fcopy_alist (parms); + /* Get the name of the frame to use for resource lookup. */ name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); if (!STRINGP (name) From 7a1831cf757847b9034ef2e1c80ccb2e65258a49 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 31 Mar 2010 12:43:53 +0300 Subject: [PATCH 03/11] Explain how to re-throw a signal. control.texi (Handling Errors): How to re-throw a signal caught by condition-case. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/control.texi | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index fd5fe0e5262..6f119b5d288 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2010-03-31 Eli Zaretskii + + * control.texi (Handling Errors): How to re-throw a signal caught + by condition-case. + 2010-03-26 Chong Yidong * loading.texi (Hooks for Loading): Document after-load-functions. diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 2b4aabaff83..1c4447e9eb5 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -1023,6 +1023,20 @@ error description. If @var{var} is @code{nil}, that means no variable is bound. Then the error symbol and associated data are not available to the handler. + +@cindex rethrow a signal +Sometimes it is necessary to re-throw a signal caught by +@code{condition-case}, for some outer-level handler to catch. Here's +how to do that: + +@smallexample + (signal (car err) (cdr err)) +@end smallexample + +@noindent +where @code{err} is the error description variable, the first argument +to @code{condition-case} whose error condition you want to re-throw. +@xref{Definition of signal}. @end defspec @defun error-message-string error-description @@ -1109,6 +1123,7 @@ Here's the example at the beginning of this subsection rewritten using @end smallexample @end defmac + @node Error Symbols @subsubsection Error Symbols and Condition Names @cindex error symbol From 95b1abcfafe8a366a75635f5fa4b4fa1e79f2964 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 31 Mar 2010 10:27:50 -0400 Subject: [PATCH 04/11] Fix last set of Nextstep changes. * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL. * nsterm.h: Fix prototype. --- src/ChangeLog | 5 +++++ src/nsfns.m | 2 +- src/nsterm.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e5571067d4a..e8243cf1c80 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-03-31 Chong Yidong + + * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL. + * nsterm.h: Fix prototype. + 2010-03-31 Eli Zaretskii * w32fns.c (x_create_tip_frame): Copy `parms' before we modify it diff --git a/src/nsfns.m b/src/nsfns.m index 9de7681b2f7..7e7fd48caf0 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -686,7 +686,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side void -ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval) +ns_set_doc_edited (struct frame *f, Lisp_Object arg) { NSView *view = FRAME_NS_VIEW (f); NSAutoreleasePool *pool; diff --git a/src/nsterm.h b/src/nsterm.h index 10d1695dc4f..01086e63b69 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -709,7 +709,7 @@ extern int ns_lisp_to_cursor_type (); extern Lisp_Object ns_cursor_type_to_lisp (int arg); extern Lisp_Object Qnone; extern void ns_set_name_as_filename (struct frame *f); -extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval); +extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg); extern int ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc, From 8cc8cecf9cf106e52e6a58c64f91d534bdd59532 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 1 Apr 2010 11:15:28 -0400 Subject: [PATCH 05/11] Fix typo. --- doc/lispref/nonascii.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 8289a498337..cedec9570a8 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -37,7 +37,7 @@ how they are stored in strings and buffers. Emacs buffers and strings support a large repertoire of characters from many different scripts, allowing users to type and display text -in most any known written language. +in almost any known written language. @cindex character codepoint @cindex codespace From 8a14dec7ef880dea69f1102cc93387a13d73c301 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 1 Apr 2010 11:24:53 -0400 Subject: [PATCH 06/11] Fix markup mistake in nonascii.texi. * nonascii.texi (Text Representations): Don't mark enable-multibyte-characters as a user option. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/nonascii.texi | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 6f119b5d288..52587432152 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2010-04-01 Chong Yidong + + * nonascii.texi (Text Representations): Don't mark + enable-multibyte-characters as a user option. + 2010-03-31 Eli Zaretskii * control.texi (Handling Errors): How to re-throw a signal caught diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index cedec9570a8..dfcb3e4730b 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -95,7 +95,7 @@ strings except for manipulating encoded text or binary non-text data. The representation for a string is determined and recorded in the string when the string is constructed. -@defopt enable-multibyte-characters +@defvar enable-multibyte-characters This variable specifies the current buffer's text representation. If it is non-@code{nil}, the buffer contains multibyte text; otherwise, it contains unibyte encoded text or binary non-text data. @@ -105,7 +105,7 @@ You cannot set this variable directly; instead, use the function The @samp{--unibyte} command line option does its job by setting the default value to @code{nil} early in startup. -@end defopt +@end defvar @defun position-bytes position Buffer positions are measured in character units. This function From d7b4879190af6e17673d8c3bdd0c71785bb4551e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 1 Apr 2010 17:34:05 +0200 Subject: [PATCH 07/11] Use correct coding system when verifying a pgp signed message * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system if set. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/mm-uu.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0106e6212c5..8cbee9138c2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-04-01 Andreas Schwab + + * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system + if set. + 2010-03-29 Katsumi Yamaoka * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag. diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index c690713ef14..5ae9205e2f0 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -486,9 +486,11 @@ apply the face `mm-uu-extract'." (if (mm-uu-pgp-signed-test) (progn (mml2015-clean-buffer) - (let ((coding-system-for-write (or gnus-newsgroup-charset + (let ((coding-system-for-write (or buffer-file-coding-system + gnus-newsgroup-charset 'iso-8859-1)) - (coding-system-for-read (or gnus-newsgroup-charset + (coding-system-for-read (or buffer-file-coding-system + gnus-newsgroup-charset 'iso-8859-1))) (funcall (mml2015-clear-verify-function)))) (when (and mml2015-use (null (mml2015-clear-verify-function))) From 194d44e7178017800d7e1d45e2add2b708b60915 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 2 Apr 2010 04:22:17 +0200 Subject: [PATCH 08/11] Fix typos in ChangeLogs. --- ChangeLog | 20 ++++++++++---------- lib-src/ChangeLog | 16 ++++++++-------- lisp/ChangeLog | 24 ++++++++++++------------ msdos/ChangeLog | 4 ++-- src/ChangeLog | 8 ++++---- src/ChangeLog.10 | 18 +++++++++--------- src/ChangeLog.8 | 42 +++++++++++++++++++++--------------------- 7 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 413c23953ed..a6ed9737245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3562,8 +3562,8 @@ 1999-10-09 Stefan Monnier - * make-dist (dontcompile): look for the DONTCOMPILE variable rather - than the obsolete dontcompilefiles pseudo-rule in lisp/Makefile. + * make-dist (dontcompile): Look for the DONTCOMPILE variable rather + than the obsolete dontcompilefiles pseudo-rule in lisp/Makefile. 1999-10-09 Richard M. Stallman @@ -3572,7 +3572,7 @@ 1999-10-08 Stefan Monnier - * update-subdirs: also ignore CVS subdirs. + * update-subdirs: Also ignore CVS subdirs. 1999-10-07 Gerd Moellmann @@ -6132,8 +6132,8 @@ src/Makefile.in is built from src/Makefile. * Makefile.in (src/Makefile, lib-src/Makefile, oldXMenu/Makefile): - If these files are out of date, simply have config.status - rebuild them; don't rebuild them explicitly. + If these files are out of date, simply have config.status + rebuild them; don't rebuild them explicitly. 1993-09-25 Brian J. Fox (bfox@ai.mit.edu) @@ -6328,7 +6328,7 @@ 1993-07-12 Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr) - * configure.in (m68k-bull-sysv3): new config. + * configure.in (m68k-bull-sysv3): New config. 1993-07-10 Jim Blandy (jimb@geech.gnu.ai.mit.edu) @@ -6551,7 +6551,7 @@ * make-dist: Rebuild configure if configure.in is newer. - * Makefile.in (src:, lib-src:, FRC:): force the src and lib-src + * Makefile.in (src:, lib-src:, FRC:): Force the src and lib-src targets to be executed even if make remembers that it has already satisfied FRC. @@ -7051,7 +7051,7 @@ * make-dist: Don't distribute etc/Old files. * GETTING.GNU.SOFTWARE, PROBLEMS: Registered into RCS with their - backups. + backups. 1993-03-20 Jim Blandy (jimb@geech.gnu.ai.mit.edu) @@ -7081,7 +7081,7 @@ 1993-03-17 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) * Makefile.in: Add commented-out variable settings for developer's - configuration. + configuration. 1993-03-14 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -7696,7 +7696,7 @@ the script. * INSTALL: Doc fix. - * Makefile: brought the Makefile up to the GNU coding + * Makefile: Brought the Makefile up to the GNU coding standards, as described in standards.text: (TAGS): New name for the target which rebuilds the tags table. (check): New target; doesn't do anything yet. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index caa7f3cfc80..e97f2672074 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -3942,7 +3942,7 @@ (xmalloc, fatal, error): New functions. (delete_socket, handle_signals): New functions. (progname, socket_name): New variables. - [HAVE_SOCKETS] (main): Call handle_signals; set the new variables. + [HAVE_SOCKETS] (main): Call handle_signals; set the new variables. 1996-09-01 Richard Stallman @@ -4715,9 +4715,9 @@ 1995-01-12 Francesco Potortì (pot@cnuce.cnr.it) * etags.c (FILEPOS, GET_CHARNO, GET_FILEPOS, max, LINENO): Deleted. - (append_to_tagfile, typedefs, typedefs_and_cplusplus, - constantypedefs, update, vgrind_style, no_warnings, - cxref_style, cplusplus, noindentypedefs): Were int, now logical. + (append_to_tagfile, typedefs, typedefs_and_cplusplus) + (constantypedefs, update, vgrind_style, no_warnings) + (cxref_style, cplusplus, noindentypedefs): Were int, now logical. (permit_duplicates): Was a var, now a #define. (filename_lb): Was global, now local to main. (main): Open the tag file when in cxref mode. @@ -4736,8 +4736,8 @@ (TOKEN_SAVED_P, SAVE_TOKEN, RESTORE_TOKEN): Deleted. (C_entries): nameb and savenameb deleted. Use dinamic allocation. (pfcnt): Deleted. Users updated. - (getit, Asm_labels, Pascal_functions, L_getit, get_scheme, - TEX_getit, prolog_getit): Use dinamic allocation for storing + (getit, Asm_labels, Pascal_functions, L_getit, get_scheme) + (TEX_getit, prolog_getit): Use dinamic allocation for storing the tag instead of a fixed size buffer. 1995-01-10 Richard Stallman @@ -6662,8 +6662,8 @@ 1990-01-19 David Lawrence (tale@cocoa-puffs) * timer.c, getdate.y (new files) and Makefile: - Sub-process support for run-at-time in timer.el. - Doesn't yet work correctly for USG. + Sub-process support for run-at-time in timer.el. + Doesn't yet work correctly for USG. 1990-01-10 Jim Kingdon (kingdon@pogo) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bd287df28d0..b30a89f8473 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -10,7 +10,7 @@ * language/indian.el (devanagari-composable-pattern) (tamil-composable-pattern, kannada-composable-pattern) - (malayalam-composable-pattern): Adjusted for the new Unicode + (malayalam-composable-pattern): Adjust for the new Unicode specification. (bengali-composable-pattern, gurmukhi-composable-pattern) (gujarati-composable-pattern, oriya-composable-pattern) @@ -3324,7 +3324,7 @@ * bookmark.el: Formatting and doc fixes only: (bookmark-search-delay): Shorten doc string to fit in 80 columns. (bookmark-bmenu-search): Wrap to fit within 80 columns. - Minor grammar and punctuation fixes in doc string. + Minor grammar and punctuation fixes in doc string. (bookmark-read-search-input): Adjust to fit within 80 columns. 2009-11-20 Tassilo Horn @@ -6079,12 +6079,12 @@ 2009-10-05 Karl Fogel * bookmark.el (bookmark-handle-bookmark): If bookmark has no file, - don't do anything related to relocating, just return nil. + don't do anything related to relocating, just return nil. (bookmark-error-no-filename): New error. (bookmark-default-handler): Signal `bookmark-error-no-filename' if - bookmark has no file. Don't even attempt to handle things that - are not files; the whole point of custom handlers is to keep that - knowledge elsewhere anyway. Tighten some comments. + bookmark has no file. Don't even attempt to handle things that + are not files; the whole point of custom handlers is to keep that + knowledge elsewhere anyway. Tighten some comments. (bookmark-file-or-variation-thereof): Remove now-unused function. (bookmark-location): Doc string fix. (Bug#4250) @@ -6114,8 +6114,8 @@ (bookmark-relocate, bookmark-insert-location, bookmark-rename) (bookmark-insert, bookmark-delete, bookmark-time-to-save-p) (bookmark-edit-annotation-mode, bookmark-edit-annotation): - Improve doc strings to say whether bookmark can be a string or - a record or both, and make other consistency and clarity fixes. + Improve doc strings to say whether bookmark can be a string or + a record or both, and make other consistency and clarity fixes. (bookmark-get-handler, bookmark--jump-via, bookmark-write-file) (bookmark-default-annotation-text, bookmark-yank-word) (bookmark-maybe-load-default-file, bookmark-maybe-sort-alist) @@ -6123,12 +6123,12 @@ (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames) (bookmark-bmenu-bookmark): Give these doc strings. (bookmark-bmenu-check-position): Give this a doc string, but also - add a FIXME comment about how the function may be pointless. + add a FIXME comment about how the function may be pointless. (bookmark-default-handler): Rework doc string and change a - parameter name, to clarify that this takes a bookmark record - not a bookmark name. + parameter name, to clarify that this takes a bookmark record + not a bookmark name. (bookmark-set): Change a parameter name to indicate its meaning, - and improve the doc string a bit. + and improve the doc string a bit. (Bug#4188) 2009-10-04 Karl Fogel diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7dd77153ac1..5889f04cf2f 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -708,7 +708,7 @@ 1994-04-30 Morten Welinder (terra@diku.dk) - * sed1.inp: don't comment out the inc-vers run as that + * sed1.inp: Don't comment out the inc-vers run as that does not exist anymore. Don't reset DEBUG_MOLE as that no longer is used. Identify the file being patched as src/... @@ -731,7 +731,7 @@ 1994-01-08 Morten Welinder (terra@diku.dk) - * sed3.inp: improve make-compatibility by not using drive + * sed3.inp: Improve make-compatibility by not using drive specifications and by not specifying an explicit shell. 1994-01-07 Morten Welinder (terra@diku.dk) diff --git a/src/ChangeLog b/src/ChangeLog index e8243cf1c80..cafbd2dda69 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -25,7 +25,7 @@ * xdisp.c (x_consider_frame_title, update_window_cursor): Remove HAVE_NS conditionals. - (prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited. + (prepare_menu_bars) [HAVE_NS]: Call ns_set_doc_edited. * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use filename for the title. @@ -331,7 +331,7 @@ 2010-01-19 Alan Mackenzie Fix spurious before-change-functions invocation from (insert ?\n). - * textprop.c (set_text_properties): rename parameter + * textprop.c (set_text_properties): Rename parameter `signal_after_change_p' to `coherent_change_p', and make the invocation of `modify_region' conditional on it. @@ -10353,7 +10353,7 @@ * font.c (Vfont_encoding_alist, find_font_encoding): Move from fontset.c. - (font_pixel_size)[! HAVE_WINDOW_SYSTEM]: Return 1. + (font_pixel_size) [! HAVE_WINDOW_SYSTEM]: Return 1. (font_open_entity): Update FRAME_X_DISPLAY_INFO (f)->n_fonts, FRAME_SMALLEST_CHAR_WIDTH (f), and FRAME_SMALLEST_FONT_HEIGHT (f) only when HAVE_WINDOW_SYSTEM is defined. @@ -20187,7 +20187,7 @@ 2007-08-29 ARISAWA Akihiro (tiny change) - * term.c (dissociate_if_controlling_tty)[USG]: Fix parse error. + * term.c (dissociate_if_controlling_tty) [USG]: Fix parse error. 2007-08-29 Yoshiaki Kasahara (tiny change) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index d4d99a80a18..39b70d9b199 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -2137,7 +2137,7 @@ * Makefile.in (keymap.o): Add "keymap.h" and "window.h" dependencies. - * keymap.c: include "window.h". + * keymap.c: Include "window.h". (Fcommand_remapping): New optional POSITION argument. (Fkey_binding): New optional POSITION argument. Completely rework handling of mouse clicks to get the same order of keymaps as @@ -5867,9 +5867,9 @@ 2005-12-26 Luc Teirlinck - * keyboard.h: extern last_point_position_window. + * keyboard.h: Extern last_point_position_window. - * undo.c: include keyboard.h. + * undo.c: Include keyboard.h. * Makefile.in (undo.o): Depend on keyboard.h. @@ -8276,7 +8276,7 @@ * xdisp.c (syms_of_xdisp) : Doc fix. (syms_of_xdisp) : Doc fix. - * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows. + * fileio.c (Frename_file) [!DOS_NT]: Don't call chown on MSDOS/Windows. 2005-06-23 Richard M. Stallman @@ -12611,7 +12611,7 @@ * macterm.c (mac_check_for_quit_char): Remove warning for using NULL where 0 should be used. * unexmacosx.c: Use malloc/malloc.h on Tiger instead of - objc/malloc.h + objc/malloc.h. * mac.c: Include time.h for Tiger compatibility. 2004-10-07 Kim F. Storm @@ -12843,7 +12843,7 @@ * Makefile.in (msdos.o): Depend on buffer.h, commands.h, and blockinput.h. (dosfns.o): Depend on blockinput.h, window.h, dispextern.h, - charset.h, and coding.h + charset.h, and coding.h. (w16select.o): Depend on buffer.h, charset.h, coding.h, and composite.h. (term.o): Depend on window.h and keymap.h. (abbrev.o): Depend on syntax.h. @@ -17222,7 +17222,7 @@ 2003-09-01 Jason Rumney * makefile.w32-in (alloca.o): Remove. - (coding.o): Depend on intervals.h + (coding.o): Depend on intervals.h. (emacs.o, bytecode.o): Depend on window.h. 2003-09-01 Dave Love @@ -22643,7 +22643,7 @@ (Fx_popup_menu): Don't show pop up menu until preceding one is actually cleaned up. Moved UNGCPRO outside #ifdef HAVE_MENUS block. - * w32menu.c: Changes adapted from xmenu.c + * w32menu.c: Changes adapted from xmenu.c. (set_frame_menubar): First parse all submenus, then make widget_value trees from them. Don't allocate any widget_value objects @@ -24232,7 +24232,7 @@ m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/ibms390.h, m/intel386.h, m/iris4d.h, m/irist.h, m/isi-ov.h, m/m68k.h, m/macppc.h, m/masscomp.h, m/mg1.h, m/mips-siemens.h, - m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h + m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpcle.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sparc.h, m/sr2k.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index de162cb39bc..6da7b6862a5 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -2886,10 +2886,10 @@ * sysdep.c: Define numerous routines to emulate Unix system calls. - * xfaces.c: on MacOS, define the set of colors listed in rgb.txt + * xfaces.c: On MacOS, define the set of colors listed in rgb.txt file of an X Window environment. - * xfaces.c: on MacOS, define the Lisp functions x-display-color-p, + * xfaces.c: On MacOS, define the Lisp functions x-display-color-p, x-display-grayscale, x-color-defined-p, and x-color-values. * sysdep.c [macintosh] (stat, fstat, mkdir, rmdir, utime, access) @@ -3160,7 +3160,7 @@ 1999-08-25 Alexandre Oliva - * unexelf.c: Merge IRIX debugging info patch from unexsgi.c + * unexelf.c: Merge IRIX debugging info patch from unexsgi.c. * m/iris4d.h: Use unexelf for IRIX 5.*. * m/iris5d.h: Use unexelf for IRIX 6.*. * unexsgi.c: Deleted. @@ -3767,8 +3767,8 @@ 1999-08-06 Gerd Moellmann * xdisp.c (compute_line_metrics): If first line's physical ascent - is larger than its logical ascent, use the physical ascent, and - make the row taller. Set row's overlapping_p flag. + is larger than its logical ascent, use the physical ascent, and + make the row taller. Set row's overlapping_p flag. * dispnew.c (redraw_overlapping_rows): Use flag overlapping_p. (direct_output_for_insert): Ditto. @@ -4675,7 +4675,7 @@ 1999-06-04 Gerd Moellmann - * xfaces.c (recompute_basic_faces)[GLYPH_DEBUG]: Check return + * xfaces.c (recompute_basic_faces) [GLYPH_DEBUG]: Check return value of realize_basic_faces. (load_face_font_or_fontset): Store full font name in face. (realize_default_face): Use full font name. @@ -5601,9 +5601,9 @@ * window.c (coordinates_in_window): Use CURRENT_MODE_LINE_HEIGHT. * xdisp.c (redisplay_window): If mode line height has changed, - arrange for a thorough immediate redisplay using the correct mode - line height. - (window_box_height): Use CURRENT_MODE_LINE_HEIGHT. + arrange for a thorough immediate redisplay using the correct mode + line height. + (window_box_height): Use CURRENT_MODE_LINE_HEIGHT. * dispextern.h (MATRIX_MODE_LINE_HEIGHT): New. (CURRENT_MODE_LINE_HEIGHT): New. @@ -7062,7 +7062,7 @@ 1998-05-04 Gerd Moellmann * Makefile.in (LIBXPM): If not already defined, define to -lXpm. - (LIBX)[HAVE_X11]: Add LIBXPM. + (LIBX) [HAVE_X11]: Add LIBXPM. * xfns.c (xpm_image_p): Implementation of image type functions for XPM. @@ -10052,7 +10052,7 @@ * xterm.h (WINDOW_COL_PIXEL_X etc.) Removed. - * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c + * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c. * xfns.c (x_contour_region): Use pixel coordinates from window cursor instead of WINDOW_TO_FRAME_H/VPOS. @@ -10897,7 +10897,7 @@ (MATRIX_ROW_INVERSE_P): Former MATRIX_ROW_HIGHLIGHT_P. (struct glyph_row): HIGHLIGHT_P -> INVERSE_P - * all files: use above new names. + * all files: Use above new names. * dispnew.c (scroll_frame_lines): Simplified. Use SCROLL_GLYPH_MATRIX. @@ -10961,7 +10961,7 @@ (init_display): Ditto. (syms_of_display): Ditto. - * dispextern.h: add prototypes for REDRAW_FRAME, + * dispextern.h: Add prototypes for REDRAW_FRAME, REDRAW_GARBAGED_FRAMES, CANCEL_LINE, CLEAR_FRAME_RECORDS, INIT_DESIRED_GLYPHS, SCROLL_FRAME_LINES, PRESERVE_OTHER_COLUMNS, ADJUST_WINDOW_CHARSTARTS, CANCEL_MY_COLUMNS, @@ -11108,9 +11108,9 @@ (make_window): Initialize DESIRED_MATRIX and CURRENT_MATRIX. (replace_window): Reset DESIRED_MATRIX and CURRENT_MATRIX - * Makefile.in (window.o): Add dependency window.c -> dispextern.h + * Makefile.in (window.o): Add dependency window.c -> dispextern.h. - * window.c: Include dispextern.h + * window.c: Include dispextern.h. * scroll.c (do_scrolling): Use new glyphs. (do_direct_scrolling): Ditto. @@ -11141,9 +11141,9 @@ (write_glyphs): Ditto. (insert_glyphs): Ditto. - * Makefile.in (term.o): term.c depends on dispextern.h + * Makefile.in (term.o): term.c depends on dispextern.h. - * term.c: Include dispextern.h + * term.c: Include dispextern.h. * dispnew.c (direct_output_forward_char): Old glyph functions removed, new inserted. @@ -11560,8 +11560,8 @@ 1999-05-02 Andrew Innes * s/ms-w32.h (HAVE_FSYNC): New macro. - (fsync): Map to _commit. - (ftruncate): Map to _chsize. + (fsync): Map to _commit. + (ftruncate): Map to _chsize. * w32term.c (dumpglyphs): On Windows NT, do output in Unicode even for ASCII, if enabled, to avoid memory allocation overhead for @@ -11666,7 +11666,7 @@ * fontset.c (Fquery_fontset): Don't check for fontset aliases here. (Fnew_fontset, Fset_fontset_font): Check for them here. - (Ffontset_info, Fnew_fontset, Fset_fontset_font): + (Ffontset_info, Fnew_fontset, Fset_fontset_font): Fix error message syntax. * buffer.c (Fmake_indirect_buffer): Copy multibyte status @@ -12775,7 +12775,7 @@ 1998-12-06 Eli Zaretskii * Makefile.in (msdos.o): Depend on termchar.h, charset.h, - coding.h, and disptab.h + coding.h, and disptab.h. * msdos.c (Vdos_unsupported_char_glyph): New variable. (syms_of_msdos): DEFVAR_LISP it. From e4b204d75ff161c1f4823eee5187fd0a64511f60 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 2 Apr 2010 04:25:19 +0200 Subject: [PATCH 09/11] Fix typos in semantic/imenu.el. * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members) (semantic-create-imenu-directory-index): Fix typos in docstrings. (semantic-imenu-goto-function): Reflow docstring. --- lisp/ChangeLog | 6 ++++++ lisp/cedet/semantic/imenu.el | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b30a89f8473..911e447129f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-04-02 Juanma Barranquero + + * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members) + (semantic-create-imenu-directory-index): Fix typos in docstrings. + (semantic-imenu-goto-function): Reflow docstring. + 2010-03-30 Tomas Abrahamsson * textmodes/artist.el (artist-mode): Fix typo in docstring. diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 3c73b893925..9ce986553aa 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -95,7 +95,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." (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. +A nil value means to keep them in the same order. Overriden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) @@ -167,8 +167,8 @@ concoct a combination of file name, and position." (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. +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) @@ -249,7 +249,7 @@ Optional argument STREAM is an optional stream of tags used to create menus." '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. + "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) From c8f19d81022a1f17cd14d1553a9c063f4eabe3c2 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 2 Apr 2010 11:24:16 -0400 Subject: [PATCH 10/11] Fix permissions handling (CVE-2010-0825). * movemail.c (main): Check return values of setuid. Avoid possibility of symlink attack when movemail is setgid mail (CVE-2010-0825). --- lib-src/ChangeLog | 6 ++++++ lib-src/movemail.c | 45 +++++++++++++++++++-------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index e97f2672074..826f5c4e6ad 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2010-04-02 Dan Rosenberg (tiny change) + + * movemail.c (main): Check return values of setuid. Avoid + possibility of symlink attack when movemail is setgid mail + (CVE-2010-0825). + 2010-03-19 Tetsurou Okazaki (tiny change) * Makefile.in (uninstall): Handle the case where archlibdir does diff --git a/lib-src/movemail.c b/lib-src/movemail.c index e0eb4d48b89..ae51df3d39c 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -197,6 +197,9 @@ main (argc, argv) # define ARGSTR "p" #endif /* MAIL_USE_POP */ + uid_t real_gid = getgid(); + uid_t priv_gid = getegid(); + #ifdef WINDOWSNT /* Ensure all file i/o is in binary mode. */ _fmode = _O_BINARY; @@ -247,25 +250,6 @@ main (argc, argv) if (*outname == 0) fatal ("Destination file name is empty", 0, 0); - /* Check access to output file. */ - if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0) - pfatal_with_name (outname); - - /* Also check that outname's directory is writable to the real uid. */ - { - char *buf = (char *) xmalloc (strlen (outname) + 1); - char *p; - strcpy (buf, outname); - p = buf + strlen (buf); - while (p > buf && !IS_DIRECTORY_SEP (p[-1])) - *--p = 0; - if (p == buf) - *p++ = '.'; - if (access (buf, W_OK) != 0) - pfatal_with_name (buf); - free (buf); - } - #ifdef MAIL_USE_POP if (!strncmp (inname, "po:", 3)) { @@ -277,15 +261,12 @@ main (argc, argv) exit (status); } - setuid (getuid ()); + if (setuid (getuid ()) < 0) + fatal ("Failed to drop privileges", 0, 0); + #endif /* MAIL_USE_POP */ #ifndef DISABLE_DIRECT_ACCESS - - /* Check access to input file. */ - if (access (inname, R_OK | W_OK) != 0) - pfatal_with_name (inname); - #ifndef MAIL_USE_MMDF #ifndef MAIL_USE_SYSTEM_LOCK #ifdef MAIL_USE_MAILLOCK @@ -379,7 +360,8 @@ main (argc, argv) time_t touched_lock, now; #endif - setuid (getuid ()); + if (setuid (getuid ()) < 0 || setegid (real_gid) < 0) + fatal ("Failed to drop privileges", 0, 0); #ifndef MAIL_USE_MMDF #ifdef MAIL_USE_SYSTEM_LOCK @@ -405,6 +387,9 @@ main (argc, argv) if (outdesc < 0) pfatal_with_name (outname); + if (setegid (priv_gid) < 0) + fatal ("Failed to regain privileges", 0, 0); + /* This label exists so we can retry locking after a delay, if it got EAGAIN or EBUSY. */ retry_lock: @@ -498,6 +483,10 @@ main (argc, argv) pfatal_and_delete (outname); #endif + /* Prevent symlink attacks truncating other users' mailboxes */ + if (setegid (real_gid) < 0) + fatal ("Failed to drop privileges", 0, 0); + /* Check to make sure no errors before we zap the inbox. */ if (close (outdesc) != 0) pfatal_and_delete (outname); @@ -529,6 +518,10 @@ main (argc, argv) } #endif /* not MAIL_USE_SYSTEM_LOCK */ + /* End of mailbox truncation */ + if (setegid (priv_gid) < 0) + fatal ("Failed to regain privileges", 0, 0); + #ifdef MAIL_USE_MAILLOCK /* This has to occur in the child, i.e., in the process that acquired the lock! */ From d86d8ea85a165558eb06fe16ffdf24c06886e7b4 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 2 Apr 2010 20:42:10 -0400 Subject: [PATCH 11/11] Bump version to 23.1.95. --- README | 2 +- configure | 18 ++-- configure.in | 2 +- doc/emacs/emacs.texi | 2 +- doc/lispref/book-spine.texinfo | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/vol1.texi | 2 +- doc/lispref/vol2.texi | 2 +- doc/man/emacs.1 | 2 +- doc/misc/faq.texi | 2 +- etc/AUTHORS | 79 ++++++++------- etc/NEWS | 3 +- lib-src/makefile.w32-in | 2 +- lisp/cedet/semantic/db-find.el | 2 +- lisp/ldefs-boot.el | 97 +++++++++++-------- lisp/version.el | 2 +- nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 +- .../Resources/English.lproj/InfoPlist.strings | 4 +- .../Emacs.base/Resources/Emacs.desktop | 2 +- .../Emacs.base/Resources/Info-gnustep.plist | 4 +- nt/emacs.rc | 8 +- nt/emacsclient.rc | 8 +- 22 files changed, 134 insertions(+), 117 deletions(-) diff --git a/README b/README index a98ac450810..41e12e0e0e8 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, See the end of the file for license conditions. -This directory tree holds version 23.1.94 of GNU Emacs, the extensible, +This directory tree holds version 23.1.95 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure b/configure index d14d02ac217..35515707f49 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for emacs 23.1.94. +# Generated by GNU Autoconf 2.62 for emacs 23.1.95. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='23.1.94' -PACKAGE_STRING='emacs 23.1.94' +PACKAGE_VERSION='23.1.95' +PACKAGE_STRING='emacs 23.1.95' PACKAGE_BUGREPORT='' ac_unique_file="src/lisp.h" @@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 23.1.94 to adapt to many kinds of systems. +\`configure' configures emacs 23.1.95 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1445,7 +1445,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 23.1.94:";; + short | recursive ) echo "Configuration of emacs 23.1.95:";; esac cat <<\_ACEOF @@ -1588,7 +1588,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 23.1.94 +emacs configure 23.1.95 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1602,7 +1602,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 23.1.94, which was +It was created by emacs $as_me 23.1.95, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -26259,7 +26259,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 23.1.94, which was +This file was extended by emacs $as_me 23.1.95, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26312,7 +26312,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -emacs config.status 23.1.94 +emacs config.status 23.1.95 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index a361489d8a3..d513705e495 100644 --- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Emacs. If not, see . AC_PREREQ(2.62) -AC_INIT(emacs, 23.1.94) +AC_INIT(emacs, 23.1.95) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index e480f45ec4e..383c8f82d90 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 23.1.94 +@set EMACSVER 23.1.95 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo index 097513778fd..03bca57387b 100644 --- a/doc/lispref/book-spine.texinfo +++ b/doc/lispref/book-spine.texinfo @@ -11,7 +11,7 @@ @center @titlefont{GNU Emacs Lisp Reference Manual} @sp 5 @center GNU -@center Emacs Version 23.1.94 +@center Emacs Version 23.1.95 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index aba6fa2ef14..195827edf43 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -8,7 +8,7 @@ @c Please remember to update the edition number in README as well. @c And also the copies in vol1.texi and vol2.texi. @set VERSION 3.0 -@set EMACSVER 23.1.94 +@set EMACSVER 23.1.95 @set DATE July 2009 @c in general, keep the following line commented out, unless doing a diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 9eb4fed6bad..d08239c5269 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.1.94 +@set EMACSVER 23.1.95 @set DATE July 2009 @dircategory Emacs diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 01424c47cbd..70992eeb036 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.1.94 +@set EMACSVER 23.1.95 @set DATE July 2009 @dircategory Emacs diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 98ffcdbb77f..488d247c2b5 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.94" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.95" . . .SH NAME diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 4850dc0e345..460022f6e8e 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -5,7 +5,7 @@ @c %**end of header @c This is used in many places -@set VER 23.1.94 +@set VER 23.1.95 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd diff --git a/etc/AUTHORS b/etc/AUTHORS index 72988c24c64..dca566f75ad 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -33,8 +33,8 @@ Adrian Lanz: changed mail-source.el spam.el Adrian Robert: co-wrote ns-win.el and changed nsterm.m nsfns.m nsfont.m nsterm.h Makefile.in nsmenu.m - configure.in README config.in emacs.c font.c keyboard.c nsgui.h image.c - lisp.h macos.texi menu.c nsimage.m xdisp.c Info-gnustep.plist darwin.h + configure.in README config.in emacs.c font.c keyboard.c nsgui.h xdisp.c + image.c lisp.h macos.texi menu.c nsimage.m Info-gnustep.plist darwin.h and 83 other files Ævar Arnfjörð Bjarmason: changed rcirc.el @@ -164,12 +164,12 @@ Andreas Leue: changed artist.el Andreas Luik: changed xfns.c xterm.c -Andreas Politz: changed elp.el ido.el term.el +Andreas Politz: changed editfns.c elp.el ido.el term.el Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c files.el coding.c alloc.c process.c print.c editfns.c fileio.c fns.c dired.el xterm.c keyboard.c simple.el eval.c info.el buffer.c sysdep.c emacs.c - and 480 other files + and 483 other files Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus.el nnslashdot.el gnus-util.el mm-url.el mm-uu.el url-http.el xterm.c @@ -230,7 +230,7 @@ and changed smime.el mml-smime.el smime-ldap.el gnus-art.el gnus-sieve.el ldap.el message.el mm-decode.el mml-sec.el mml.el mule-conf.el nnimap.el nnrss.el wid-edit.el -Arni Magnusson: changed ada-mode.texi +Arni Magnusson: changed ada-mode.texi frames.texi Artem Chuprina: changed message.el @@ -282,7 +282,7 @@ Benjamin Rutt: co-wrote gnus-dired.el and changed vc.el gnus-msg.el message.el diff-mode.el ffap.el nnimap.el nnmbox.el simple.el vc-cvs.el -Bernhard Herzog: changed vc-hg.el +Bernhard Herzog: changed vc-hg.el menu.c Bernt Hansen: changed org-clock.el @@ -433,10 +433,10 @@ Chip Coldwell: changed font.c Chong Yidong: wrote redisplay-testsuite.el and co-wrote longlines.el -and changed xdisp.c simple.el files.el display.texi files.texi - frames.texi keyboard.c cus-edit.el faces.el xterm.c Makefile.in - emacs.texi xfaces.c font.c startup.el xfns.c image.c misc.texi - compile.el configure.in custom.texi and 608 other files +and changed xdisp.c simple.el files.el display.texi frames.texi + files.texi emacs.texi keyboard.c cus-edit.el faces.el xterm.c + Makefile.in xfaces.c font.c startup.el xfns.c misc.texi image.c + compile.el custom.texi text.texi and 633 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -557,6 +557,8 @@ and changed vc.el vc-hg.el vc-git.el Makefile.in vc-bzr.el vc-cvs.el emacs.c files.el term.c process.c vc-rcs.el bindings.el diff-mode.el lisp-mode.el and 840 other files +Dan Rosenberg: changed movemail.c + Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el Daniel Colascione: co-wrote js.el @@ -905,25 +907,26 @@ Eric Knauel: changed gnus.el spam-report.el spam.el Eric M. Ludlam: wrote analyze.el args.el autoconf-edit.el bovine.el c.el cedet-cscope.el cedet-files.el cedet-global.el cedet-idutils.el - cedet-utests.el chart.el checkdoc.el compile.el cpp-root.el + cedet-utests.el chart.el checkdoc.el compile.el complete.el cpp-root.el cscope.el ctxt.el data-debug.el db-debug.el db-el.el db-file.el db-find.el db-global.el db-mode.el db-ref.el db-typecache.el db.el debug.el decorate.el dep.el dframe.el dictionary.el dired.el doc.el - document.el ede-grammar.el ede.el edit.el eieio-base.el eieio-comp.el - eieio-custom.el eieio-datadebug.el eieio-opt.el eieio-speedbar.el - eieio.el el.el expandproto.el extract.el ezimage.el fcn.el - fields.el filter.el filters.el find.el format.el fw.el gcc.el - getset.el global.el grep.el html.el ia-sb.el ia.el idle.el idutils.el - include.el insert.el inversion.el java.el javascript.el lex-spp.el - lex.el linux.el list.el locate.el make.el makefile-edit.el map.el - mode.el mru-bookmark.el pconf.el pmake.el proj-archive.el proj-aux.el - proj-comp.el proj-elisp.el proj-info.el proj-misc.el proj-obj.el - proj-prog.el proj-scheme.el proj-shared.el proj.el project-am.el - pulse.el refs.el sb-image.el sb.el scm.el scope.el semantic-ia-utest.el - semantic-tests.el semantic-utest-c.el semantic-utest.el semantic.el - shell.el simple.el sort.el source.el speedbar.el srecode.el srt.el + document.el ede-grammar.el ede-tests.el ede.el edit.el eieio-base.el + eieio-comp.el eieio-custom.el eieio-datadebug.el eieio-opt.el + eieio-speedbar.el eieio.el el.el emacs.el expandproto.el extract.el + ezimage.el fcn.el fields.el files.el filter.el filters.el find.el + format.el fw.el gcc.el getset.el global.el grep.el html.el ia-sb.el + ia.el idle.el idutils.el imenu.el include.el insert.el inversion.el + java.el javascript.el lex-spp.el lex.el linux.el list.el locate.el + make.el makefile-edit.el map.el mode.el mru-bookmark.el pconf.el + pmake.el proj-archive.el proj-aux.el proj-comp.el proj-elisp.el + proj-info.el proj-misc.el proj-obj.el proj-prog.el proj-scheme.el + proj-shared.el proj.el project-am.el pulse.el refs.el sb-image.el sb.el + scm.el scope.el semantic-ia-utest.el semantic-tests.el + semantic-utest-c.el semantic-utest.el semantic.el shell.el simple.el + sort.el source.el speedbar.el srecode-tests.el srecode.el srt.el symref.el system.el table.el tag-file.el tag-ls.el tag-write.el tag.el - texi.el util.el + test.el texi.el util.el and co-wrote cpp.el db-ebrowse.el util-modes.el and changed *.el info.el rmail.el speedbspec.el gud.el sb-dir-minus.xpm sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm @@ -999,9 +1002,9 @@ Flemming Hoejstrup Hansen: changed forms.el Florian Weimer: changed message.el gnus.el coding.c gnus-sum.el gnus.texi mm-decode.el mm-util.el -Francesc Rocher: changed startup.el cus-start.el gnus.el gnus.png - gnus.svg macterm.c splash.png splash.svg splash8.xpm w32term.c xdisp.c - xterm.c +Francesc Rocher: changed startup.el MORE.STUFF cus-start.el gnus.el + gnus.png gnus.svg macterm.c splash.png splash.svg splash8.xpm w32term.c + xdisp.c xterm.c Francesco Potortì: wrote cmacexp.el and changed etags.c man.el delta.h etags.1 undigest.el Makefile.in @@ -1130,7 +1133,7 @@ and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in cal-islam.el bytecomp.el calendar.texi cal-bahai.el files.el appt.el cal-china.el emacs.texi rmailsum.el simple.el startup.el - and 972 other files + and 975 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1342,7 +1345,7 @@ and changed bytecode.c mail-extr.el subr.el Jan Djärv: wrote dnd.el font-setting.el x-dnd.el and changed gtkutil.c xterm.c xfns.c configure.in xterm.h xmenu.c x-win.el Makefile.in gtkutil.h keyboard.c frame.c frames.texi config.in - emacs.c xselect.c startup.el xresources.texi alloc.c cus-start.el + emacs.c xselect.c xresources.texi startup.el alloc.c cus-start.el xlwmenu.c process.c and 203 other files Jan Moringen: co-wrote cpp.el @@ -1629,10 +1632,10 @@ João Cachopo: changed spam.el Juan León Lahoz García: wrote wdired.el and changed files.el perl-mode.el -Juanma Barranquero: changed makefile.w32-in subr.el files.el bs.el - faces.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c +Juanma Barranquero: changed makefile.w32-in subr.el files.el faces.el + bs.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el - keyboard.c replace.el eval.c and 924 other files + keyboard.c replace.el eval.c and 930 other files Juergen Hoetzel: changed url-handlers.el @@ -1729,7 +1732,7 @@ Katsumi Yamaoka: wrote canlock.el and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el mm-util.el mm-view.el rfc2047.el mml.el gnus-group.el gnus-msg.el gnus-util.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el - mm-uu.el nnmail.el emacs-mime.texi nnheader.el and 107 other files + mm-uu.el nnmail.el emacs-mime.texi nnheader.el and 108 other files Kaveh R. Ghazi: changed delta88k.h xterm.c @@ -2948,6 +2951,8 @@ Stefan Wiens: changed gnus-sum.el Steinar Bang: changed imap.el +Štěpán Němec: changed subr.el vc-git.el + Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi ediff-mult.el @@ -3083,7 +3088,7 @@ Terrence Brannon: wrote landmark.el Terry Jones: wrote shadow.el -Tetsurou Okazaki: changed byte-opt.el log-edit.el xterm.c +Tetsurou Okazaki: changed Makefile.in byte-opt.el log-edit.el xterm.c Thamer Mahmoud: changed arabic.el @@ -3311,7 +3316,7 @@ William Xu: changed outline.el webjump.el Wilson H. Tien: changed unexelf.c -Wilson Snyder: changed verilog-mode.el +Wilson Snyder: changed verilog-mode.el files.el Wim Nieuwenhuizen: changed TUTORIAL.nl @@ -3343,7 +3348,7 @@ Yagi Tatsuya: changed gnus-art.el gnus-start.el Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h macmenu.c macgui.h image.c macselect.c xdisp.c keyboard.c xterm.c Makefile.in emacs.c darwin.h macos.texi unexmacosx.c w32term.c alloc.c - configure.in dispnew.c and 82 other files + configure.in dispnew.c and 83 other files Yann Dirson: changed imenu.el diff --git a/etc/NEWS b/etc/NEWS index 4fba24d9516..0d6bfbf52aa 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -268,6 +268,7 @@ unaware that their mail configuration has changed. To disable this check, set compose-mail-user-agent-warnings to nil. +--- ** The default value of mail-interactive is t, since Emacs 23.1. (This was not announced at the time.) It means that when sending mail, Emacs will wait for the process sending mail to return. If you @@ -464,7 +465,7 @@ mode from `auto-mode-alist' (or Fundamental mode) and `image-minor-mode'. * Lisp changes in Emacs 23.2 - +--- ** All the default-FOO variables that hold the default value of the FOO variable, are now declared obsolete. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index b59273ef33d..131cca7fdd7 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs .PHONY: $(ALL) -VERSION = 23.1.94 +VERSION = 23.1.95 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 754ba231c37..4c2626ca8bd 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -774,7 +774,7 @@ Examines the variable `semanticdb-find-lost-includes'." (buffer-name)) (data-debug-new-buffer "*SEMANTICDB lost-includes ADEBUG*") - (data-debug-insert-tag-list lost "*") + ;; (data-debug-insert-tag-list lost "*") ))) (defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index c60b644753c..d4ccb4ceea7 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -1149,8 +1149,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19352 -;;;;;; 21362)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19378 +;;;;;; 33860)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1319,7 +1319,7 @@ Selecting operation Variables - This is a brief overview of the different varaibles. For more info, + This is a brief overview of the different variables. For more info, see the documentation for the variables (type \\[describe-variable] RET). artist-rubber-banding Interactively do rubber-banding or not @@ -2963,7 +2963,7 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (19352 21360)) +;;;;;; (19367 42950)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -4851,7 +4851,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;;;; customize-mode customize customize-save-variable customize-set-variable ;;;;;; customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically ;;;;;; custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el" -;;;;;; (19352 21362)) +;;;;;; (19359 48895)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5719,7 +5719,7 @@ as well as widgets, buttons, overlays, and text properties. ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (19352 21353)) +;;;;;; "desktop.el" (19370 51420)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -10459,7 +10459,7 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (19352 21362)) +;;;;;; "flyspell" "textmodes/flyspell.el" (19369 7847)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -10782,7 +10782,7 @@ and choose the directory as the fortune-file. ;;;*** ;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el" -;;;;;; (19352 21362)) +;;;;;; (19372 60979)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload 'gdb "gdb-ui" "\ @@ -13641,8 +13641,8 @@ The main features of this mode are ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19352 -;;;;;; 21354)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19355 +;;;;;; 62587)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14118,7 +14118,7 @@ Example: ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (19352 21354)) +;;;;;; "image-dired" "image-dired.el" (19367 42949)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\ @@ -14160,7 +14160,7 @@ you have the dired buffer in the left window and the 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 @@ -15367,7 +15367,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19352 21355)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19375 48608)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16475,7 +16475,7 @@ The mail client is taken to be the handler of mailto URLs. ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (19352 21355)) +;;;;;; "make-mode" "progmodes/make-mode.el" (19370 15152)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -16707,7 +16707,7 @@ Returns non-nil if the new state is enabled. ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (19352 21361)) +;;;;;; "gnus/message.el" (19374 17766)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17353,7 +17353,7 @@ Insert file contents of URL using `mm-url-program'. ;;;*** ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu" -;;;;;; "gnus/mm-uu.el" (19352 21355)) +;;;;;; "gnus/mm-uu.el" (19382 2266)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -22562,8 +22562,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19352 -;;;;;; 21358)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19367 +;;;;;; 42950)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22815,8 +22815,8 @@ variable. ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-dont-reply-to-names rmail-user-mail-address-regexp -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19352 -;;;;;; 21360)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19363 +;;;;;; 36802)) ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -23783,7 +23783,7 @@ Semantic mode. ;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-interactive ;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) -;;;;;; "sendmail" "mail/sendmail.el" (19352 21361)) +;;;;;; "sendmail" "mail/sendmail.el" (19374 15070)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -23937,9 +23937,11 @@ File containing the text inserted at end of mail buffer.") (custom-autoload 'mail-signature-file "sendmail" t) (defvar mail-default-directory (purecopy "~/") "\ -Directory for mail buffers. -Value of `default-directory' for mail buffers. -This directory is used for auto-save files of mail buffers.") +Value of `default-directory' for Mail mode buffers. +This directory is used for auto-save files of Mail mode buffers. + +Note that Message mode does not use this variable; it auto-saves +in `message-auto-save-directory'.") (custom-autoload 'mail-default-directory "sendmail" t) @@ -24660,7 +24662,7 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (19352 21358)) +;;;;;; (19367 42950)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24670,8 +24672,8 @@ A list of images is returned. \(fn START END)" t nil) (autoload 'smiley-buffer "smiley" "\ -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. \(fn &optional BUFFER)" t nil) @@ -26678,7 +26680,7 @@ tetris-mode keybindings: ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (19352 21363)) +;;;;;; (19371 46148)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27673,7 +27675,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (19352 21359)) +;;;;;; "tmm.el" (19376 53416)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27923,7 +27925,7 @@ to a tcp server on another machine. ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (19352 21359)) +;;;;;; "trace" "emacs-lisp/trace.el" (19367 42950)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer (purecopy "*trace-output*") "\ @@ -27936,7 +27938,7 @@ Traces FUNCTION with trace output going to BUFFER. 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. @@ -27960,7 +27962,7 @@ BUFFER defaults to `trace-buffer'. ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (19352 21361)) +;;;;;; "net/tramp.el" (19356 59749)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29183,7 +29185,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;;;; vc-create-tag vc-merge vc-insert-headers vc-revision-other-window ;;;;;; vc-root-diff vc-diff vc-version-diff vc-register vc-next-action ;;;;;; vc-before-checkin-hook vc-checkin-hook vc-checkout-hook) -;;;;;; "vc" "vc.el" (19352 21359)) +;;;;;; "vc" "vc.el" (19371 62620)) ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ @@ -29270,9 +29272,10 @@ saving the buffer. \(fn HISTORIC &optional NOT-URGENT)" t nil) (autoload 'vc-root-diff "vc" "\ -Display diffs between file revisions. -Normally this compares the currently selected fileset with their -working revisions. With a prefix argument HISTORIC, it reads two revision +Display diffs between VC-controlled whole tree revisions. +Normally, this compares the tree corresponding to the current +fileset with the working revision. +With a prefix argument HISTORIC, prompt for two revision designators specifying which revisions to compare. The optional argument NOT-URGENT non-nil means it is ok to say no to @@ -29327,12 +29330,20 @@ allowed and simply skipped). (autoload 'vc-print-log "vc" "\ List the change log of the current fileset in a window. -If WORKING-REVISION is non-nil, leave the point at that revision. +If WORKING-REVISION is non-nil, leave point at that revision. +If LIMIT is non-nil, it should be a number specifying the maximum +number of revisions to show; the default is `vc-log-show-limit'. + +When called interactively with a prefix argument, prompt for +WORKING-REVISION and LIMIT. \(fn &optional WORKING-REVISION LIMIT)" t nil) (autoload 'vc-print-root-log "vc" "\ -List the change log of for the current VC controlled tree in a window. +List the change log for the current VC controlled tree in a window. +If LIMIT is non-nil, it should be a number specifying the maximum +number of revisions to show; the default is `vc-log-show-limit'. +When called interactively with a prefix argument, prompt for LIMIT. \(fn &optional LIMIT)" t nil) @@ -31435,7 +31446,7 @@ With arg, turn Winner mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman woman-locale) -;;;;;; "woman" "woman.el" (19352 21359)) +;;;;;; "woman" "woman.el" (19359 48737)) ;;; Generated autoloads from woman.el (defvar woman-locale nil "\ @@ -31788,8 +31799,8 @@ Zone out, completely. ;;;;;; "cedet/semantic/edit.el" "cedet/semantic/find.el" "cedet/semantic/format.el" ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" -;;;;;; "cedet/semantic/idle.el" "cedet/semantic/java.el" "cedet/semantic/lex-spp.el" -;;;;;; "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" +;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" ;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" ;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" ;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" @@ -31928,8 +31939,8 @@ Zone out, completely. ;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" ;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" ;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el" -;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19352 -;;;;;; 23109 108328)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19382 +;;;;;; 35538 347447)) ;;;*** diff --git a/lisp/version.el b/lisp/version.el index fbdabd571af..c5c9bfa5fb6 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.1.94" "\ +(defconst emacs-version "23.1.95" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 35df94e336a..18033a3679c 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 23.1.94 Copyright (C) 2010 Free Software Foundation, Inc. + Emacs 23.1.95 Copyright (C) 2010 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 23.1.94 + 23.1.95 CFBundleSignature EMAx diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 9f868885612..ef467d6c9b3 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 23.1.94"; -CFBundleGetInfoString = "Emacs version 23.1.94, NS Windowing"; +CFBundleShortVersionString = "Version 23.1.95"; +CFBundleGetInfoString = "Emacs version 23.1.95, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index 3e7b2171649..4c6073e402e 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=23.1.94 +Version=23.1.95 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index e9477bb1b94..80a3fc1b137 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "23.1.94"; + ApplicationRelease = "23.1.95"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2010 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 23.1.94, NS Windowing"; + FullVersionID = "Emacs 23.1.95, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/emacs.rc b/nt/emacs.rc index 1b7efabbceb..bdeae568f41 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,1,94,0 - PRODUCTVERSION 23,1,94,0 + FILEVERSION 23,1,95,0 + PRODUCTVERSION 23,1,95,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 1, 94, 0\0" + VALUE "FileVersion", "23, 1, 95, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "23, 1, 94, 0\0" + VALUE "ProductVersion", "23, 1, 95, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index eaaf6f8049d..20b764cc352 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,1,94,0 - PRODUCTVERSION 23,1,94,0 + FILEVERSION 23,1,95,0 + PRODUCTVERSION 23,1,95,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 1, 94, 0\0" + VALUE "FileVersion", "23, 1, 95, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "23, 1, 94, 0\0" + VALUE "ProductVersion", "23, 1, 95, 0\0" VALUE "OLESelfRegister", "\0" END END