*** empty log message ***

5 files changed, 114 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index bc0ddefdb9..07f0f09739 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2042,6 +2042,10 @@ configuration files.
 
 * Lisp Changes in Emacs 21.4
 
+** If the buffer's undo list for the current command gets longer than
+undo-outer-limit, garbage collection empties it.  This is to prevent
+it from using up the available memory and choking Emacs.
+
 ** New function quail-find-key returns a list of keys to type in the
 current input method to input a character.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28f6d39423..ecb98eb016 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,56 @@
+2004-05-29  Richard M. Stallman  <[email protected]>
+
+	* net/browse-url.el (browse-url-interactive-arg): Doc fix.
+
+	* emacs-lisp/lisp-mode.el (prin1-char): Catch errors from `string'.
+	(eval-last-sexp-print-value): Print char equivalent regardless
+	of standard-output value.
+
+	* thumbs.el (thumbs-subst-char-in-string): Deleted.
+	(thumbs-thumbname): Use subst-char-in-string.
+	(thumbs-resize-image): Use condition-case, not ignore-errors.
+	(thumbs-kill-buffer): Likewise.
+
+	* thumbs.el: Don't include cl.  Don't bother with old Emacs versions.
+	(thumbs-mode): Make buffer read-only.
+	(thumbs-make-thumb): Unconditionally accept an existing file.
+	(thumbs-insert-thumb): Add thumb-image-file property to the image.
+	(thumbs-do-thumbs-insertion): Be smarter about where to put newlines.
+	(thumbs-show-thumbs-list): Error if images not supported.
+	(thumbs-save-current-image): Improve prompt string.
+	(thumbs-mode-map): Define u, R, x.
+	(thumbs-unmark): New command.
+	(thumbs-emboss-image): Minor cleanup.
+	(thumbs-forward-char, thumbs-backward-char): Skip chars with no image.
+	(thumbs-rename-images): New command.
+	(thumbs-show-image-num): Rewrite.  Don't rename the buffer.
+
+	* thumbs.el (thumbs-current-image): New function.
+	(thumbs-file-list, thumbs-file-alist): New functions.
+	(thumbs-find-image): Delete arg L.
+	Don't set up thumbs-fileL as buffer-local global var.
+	(thumbs-find-image-at-point): Use thumbs-current-image.
+	(thumbs-set-image-at-point-to-root-window): Likewise.
+	(thumbs-delete-images): Use thumbs-current-image, thumbs-file-alist.
+	Record and warn about errors.  Update thumbs-markedL for deletions.
+	(thumbs-next-image, thumbs-previous-image): Use thumbs-file-alist.
+	(thumbs-redraw-buffer): Use thumbs-file-list.
+	(thumbs-mark): Use thumbs-current-image.
+	(thumbs-show-name): Use thumbs-current-image.
+
+	* imenu.el (imenu--menubar-select): Set imenu-menubar-modified-tick
+	and imenu--last-menubar-index-alist.
+
+	* subr.el (with-selected-window): Undo previous change.
+
+2004-05-29  John Paul Wallington  <[email protected]>
+
+	* thumbs.el (thumbs-show-name): Do nothing if no image at point.
+	(thumbs-mouse-find-image): New command.
+	(thumbs-mode-map): Bind it to mouse-2.
+	(thumbs-mode):  Make mode-class special.
+	(thumbs-view-image-mode): Likewise.
+
 2004-05-29  Pavel Kobiakov  <[email protected]>
 
 	* flymake.el: New file.
@@ -97,6 +150,7 @@
 	(starttls-negotiate, starttls-open-stream): Check `starttls-use-gnutls'
 	and pass on to corresponding *-gnutls function if it is set.
 
+>>>>>>> 1.6105
 2004-05-27  Luc Teirlinck  <[email protected]>
 
 	* autorevert.el (auto-revert-handler): Disable auto-reverting of
@@ -238,6 +292,7 @@
 	* progmodes/grep.el (grep-tree): Ensure that DIR argument is
 	interpreted as a directory.
 
+>>>>>>> 1.6097
 2004-05-22  Richard M. Stallman  <[email protected]>
 
 	* textmodes/paragraphs.el (sentence-end): Match unicode curly quotes
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index aa49c8d1d1..fcc2e5cf5d 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-29  Richard M. Stallman  <[email protected]>
+
+	* modes.texi (Minor Mode Conventions): (-) has no special meaning
+	as arg to a minor mode command.
+
 2004-05-22  Richard M. Stallman  <[email protected]>
 
 	* syntax.texi (Syntax Class Table): Word syntax not just for English.
diff --git a/man/ChangeLog b/man/ChangeLog
index 96fdc1e5d0..ca19d15225 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,39 @@
+2004-05-29  Richard M. Stallman  <[email protected]>
+
+	* custom.texi (Init File): Two dashes start --no-site-file.
+
+	* cl.texi (Top): Call this chapter `Introduction'.
+	(Overview): In TeX, no section heading here.
+
+	* cc-mode.texi: Put commas after i.e. and e.g.  Minor cleanups.
+
+2004-05-29  Alan Mackenzie  <[email protected]>
+
+	* programs.texi: Updated for CC Mode 5.30 and incidental amendments.
+	("AWK"): is consistently thus spelt throughout.
+	(AWK, Pike): documented as "C-like modes".
+	(@kbd{M-j}): documented as alternative to @kbd{C-M-j}.
+	(M-x man): supersedes M-x manual-entry.
+	Added numerous index entries.  Corrected "ESC a/e" to "M-a/e".
+
+	("Comments in C"): Node deleted; the info is in CC Mode manual.
+	(c-comment-only-line-offset): Description removed.
+
+	(C-c ., C-c C-c): New C Mode bindings described.
+
+	(C-u TAB, indent-code-rigidly, c-indent-exp, c-tab-always-indent)
+	(@dfn{Style}, c-default-style, comment-column, comment-padding)
+	(c-up-conditional, c-beginning-of-statement, c-end-of-statement):
+	Definitions amended.
+
+	(c-beginning-of-defun, c-end-of-defun, c-context-line-break):
+	Functions described.
+	
+	(c-comment-start-regexp, c-hanging-comment-ender-p)
+	(c-hanging-comment-starter-p): obsolete definitions removed.
+
+	* emacs.texi: Remove the menu entry "Comments in C".
+
 2004-05-29  Eli Zaretskii  <[email protected]>
 
 	* Makefile.in (../info/flymake, flymake.dvi): New targets.
diff --git a/src/ChangeLog b/src/ChangeLog
index df10f95e50..89ee091352 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2004-05-29  Richard M. Stallman  <[email protected]>
+
+	* lisp.h (truncate_undo_list): Update decl.
+
+	* alloc.c (undo_outer_limit): New variable.
+	(syms_of_alloc): Defvar it.
+	(Fgarbage_collect): Pass undo_outer_limit to truncate_undo_list.
+
+	* undo.c (truncate_undo_list): New arg LIMITSIZE.
+
+	* alloc.c (lisp_align_malloc): Check for base == 0
+	regardless of HAVE_POSIX_MEMALIGN.
+	Clean up HAVE_POSIX_MEMALIGN handling of `err'.
+
 2004-05-28  Stefan Monnier  <[email protected]>
 
 	* alloc.c: Undo Kim's recent changes and fix the same bug differently.