changeset 46649:5b983d53ff02

*** empty log message ***

--- a/lisp/ChangeLog	Tue Jul 23 19:31:18 2002 +0000
+++ b/lisp/ChangeLog	Tue Jul 23 19:33:09 2002 +0000
@@ -1,3 +1,19 @@
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* warnings.el: Add `provide' call.
+
+	* files.el (basic-save-buffer-2): If there's an error writing the file,
+	unrename the backup file if it was just made.
+	(backup-buffer, basic-save-buffer-2, basic-save-buffer-1) 
+	(basic-save-buffer): Value now has form (MODES . BACKUPNAME)
+	when a backup was just made by renaming.  Otherwise it's nil.
+
+	* wid-edit.el (widget-convert): Handle an argument that's a keyword.
+	Recognize explicit :args specification.
+
+	* international/mule-cmds.el (select-safe-coding-system):
+	Don't ask for confirmation of mismatch if find-file-literally was used.
+
 2002-07-23  Markus Rost  <[e-mail]>
 
 	* add-log.el (add-log-current-defun):  Fix typo in documentation.
@@ -28,6 +44,58 @@
 
 	* vc.el (vc-next-action-on-file): Preserve find-file-literally.
 
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* simple.el (undo, undo-more): Adjust messages when undoing in a
+	region. 
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* net/browse-url.el (browse-url-lynx-input-attempts): Use defcustom.
+	(browse-url-lynx-input-delay): Add custom type and group.
+
+	* cus-start.el (double-click-fuzz): Added.
+
[phone]  Alan Shutko  <[e-mail]>
+
+	* calendar/solar.el (diary-sabbath-candles): Add optional MARK
+	parameter, specifying what face or character to use in the
+	calendar display.  These will now return (MARK . ENTRY).
+
+	* calendar/lunar.el (diary-phases-of-moon): Add optional MARK
+	parameter, specifying what face or character to use in the
+	calendar display.  These will now return (MARK . ENTRY).
+
+	* calendar/cal-hebrew.el (diary-omer, diary-yahrzeit)
+	(diary-rosh-hodesh, diary-parasha, diary-parasha): Add optional
+	MARK parameter, specifying what face or character to use in the
+	calendar display.  These will now return (MARK . ENTRY).
+
+	* calendar/diary-lib.el (mark-sexp-diary-entries): Retrieve mark
+	from diary-sexp-entry and pass it to mark-visible-calendar-date.
+	(list-sexp-diary-entries): Update doc string for new docs for ....
+	If diary-sexp-entry returns a cons, only add the text to the diary
+	list.
+	(diary-sexp-entry): Allow sexps to return a cons of the form (MARK
+	. STRING) to specify what face or character mark should be used in
+	the calendar display.
+	(diary-date, diary-block, diary-float, diary-anniversary)
+	(diary-cyclic): Add optional MARK parameter, specifying what face
+	or character to use in the calendar display.  These will now
+	return (MARK . ENTRY).
+
+	* calendar/diary-lib.el (check-calendar-holidays, diary-iso-date)
+	(calendar-holiday-list, diary-french-date, diary-mayan-date) 
+	(diary-julian-date, diary-astro-day-number, diary-chinese-date) 
+	(diary-islamic-date, list-islamic-diary-entries) 
+	(mark-islamic-diary-entries, mark-islamic-calendar-date-pattern) 
+	(diary-hebrew-date, diary-omer, diary-yahrzeit, diary-parasha) 
+	(diary-rosh-hodesh, list-hebrew-diary-entries) 
+	(mark-hebrew-diary-entries, mark-hebrew-calendar-date-pattern) 
+	(diary-coptic-date, diary-persian-date, diary-phases-of-moon) 
+	(diary-sunrise-sunset, diary-sabbath-candles):
+	Remove interactive flag from autoloads.
+
 2002-07-22  Carsten Dominik  <[e-mail]>
 
 	* textmodes/reftex-vars.el (reftex-index-verify-function): New
@@ -76,7 +144,19 @@
 	(reftex-parse-bibtex-entry): Use `reftex-syntax-table-for-bib'.
 	(reftex-with-special-syntax-for-bib): new macro.
 
+<<<<<<< ChangeLog
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* international/ucs-tables.el (ucs-quail-activate):
+	Cope if buffer-file-coding-system is nil.
+
+	* bindings.el (last-buffer): Use buffer-list with frame arg.
+	Create *scratch* if no other choice exists.  Fix bugs. 
+
[phone]  Kai Gro,b_(Bjohann  <[e-mail]>
+=======
 2002-07-21  Kai Gro,A_(Bjohann  <[e-mail]>
+>>>>>>> 1.4146
 
 	* net/tramp.el: Bump version to 2.0.2.
 	(tramp-methods): Rename methods invoking "ssh1" or "ssh2" to

--- a/src/ChangeLog	Tue Jul 23 19:31:18 2002 +0000
+++ b/src/ChangeLog	Tue Jul 23 19:33:09 2002 +0000
@@ -1,3 +1,11 @@
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xdisp.c (redisplay_updating_p): New variable.
+	(init_iterator): Don't free realized faces when
+	redisplay_updating_p is set.
+	(redisplay_internal): Set redisplay_updating_p while updating
+	the display.
+
 2002-07-23  Richard M. Stallman  <[e-mail]>
 
 	* editfns.c (Fmessage): Treat "" like nil.