*** empty log message ***

4 files changed, 75 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 8a58a51ec58..a558ee76fd4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1124,6 +1124,15 @@ with Custom.
 ** New function `optimize-char-coding-system-table' can be called
 after making changes to `char-coding-system-table'.
 
+** `save-selected-window' now saves and restores the selected window
+of every frame.  This way, it restores everything that can be changed
+by calling `select-window'.
+
+** `easy-menu-define' now allows you to use nil for the symbol name
+if you don't need to give the menu a name.  If you install the menu
+into other keymaps right away (MAPS is non-nil), it usually doesn't
+need to have a name.
+
 ** Byte compiler changes:
 
 *** `(featurep 'xemacs)' is treated by the compiler as nil.  This
diff --git a/etc/TUTORIAL.translators b/etc/TUTORIAL.translators
index 9c0e8114fe2..7bf280ac032 100644
--- a/etc/TUTORIAL.translators
+++ b/etc/TUTORIAL.translators
@@ -1,10 +1,10 @@
 This file contains the list of translators of the tutorial.
 
+TUTORIAL.bg: Ognyan Kulev <ogi@fmi.uni-sofia.bg>
 TUTORIAL.cs: Milan Zamazal <pdm@zamazal.org>
              Pavel Janík <Pavel@Janik.cz>
 TUTORIAL.de: Werner Lemberg <wl@gnu.org>
-TUTORIAL.es: Carlos Alberto López Troncoso
-             Igor Tamara Patino <igor@tamarapatino.com>
+TUTORIAL.es: Rafael Sepúlveda <drs@gnulinux.org.mx>
 TUTORIAL.fr: Éric Jacoboni <jaco@teaser.fr>
 TUTORIAL.ja: Kenichi Handa <handa@m17n.org>
 TUTORIAL.ko: Koaunghi Un <koaunghi@ling.cnu.ac.kr>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fad8b49ae50..1bc6da4cdfe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,57 @@
 	* cus-start.el (scroll-up-aggressively, scroll-down-aggressively):
 	Update custom types.
 
+2002-12-23  Alex Schroeder  <alex@emacswiki.org>
+
+        Merging Dave Love <fx@gnu.org>'s custom_themes branch containing
+	Alex Schroeder's adaptation of Jan Vroonhof
+	<vroonhof@math.ethz.ch>'s code.  Doc strings corrected by RMS.
+	
+	* cus-edit.el (customize-save-variable): Take themes into account.
+	(custom-variable-save): Take themes into account.
+	(custom-variable-reset-saved): Add comment-widget.
+	(custom-variable-reset-standard): Add comment-widget.
+	(custom-variable-reset-standard): Take themes into account.
+	(custom-face-save): Take themes into account.
+	(custom-face-reset-standard): Take themes into account.
+	(custom-save-variables): Take themes into account.
+	(custom-save-faces): Take themes into account.
+	(custom-save-faces): Take themes into account.
+	(custom-save-resets): New function.
+	(custom-save-loaded-themes): New function.
+	(customize-save-customized): Take themes into account.
+
+	* cus-face.el (custom-set-faces): Call custom-theme-set-faces.
+	(custom-theme-set-faces): New function.
+	(custom-theme-face-value): New function.
+	(custom-theme-reset-internal-face): New function.
+	(custom-theme-reset-faces): New function.
+	(custom-reset-faces): New function.
+
+	* custom.el (custom-known-themes): New variable.
+	(custom-declare-theme): New function.
+	(deftheme): New macro.
+	(custom-make-theme-feature): New function.
+	(custom-theme-p): New function.
+	(custom-check-theme): New function.
+	(custom-push-theme): New function.
+	(custom-theme-set-variables): Take themes into account.
+	(custom-loaded-themes): New variable.
+	(custom-theme-loaded-p): New function.
+	(provide-theme): New function.
+	(require-theme): New function.
+	(custom-remove-theme): New function.
+	(custom-do-theme-reset): New function.
+	(custom-theme-load-themes): New function.
+	(custom-load-themes): New function.
+	(custom-theme-value): New function.
+	(custom-theme-variable-value): New function.
+	(custom-theme-reset-internal): New function.
+	(custom-theme-reset-variables): New function.
+	(custom-reset-variables): New function.
+
+	* cus-theme.el: New file.
+
 2002-12-23  Matthew Swift  <swift@alum.mit.edu>
 
 	* emacs-lisp/rx.el (rx-and): Generate a shy group.
diff --git a/src/ChangeLog b/src/ChangeLog
index 2cd921bd399..f37b3f580d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-23  Richard M. Stallman  <rms@gnu.org>
+
+	* buffer.c (syms_of_buffer) <scroll-up-aggressively>
+	<scroll-down-aggressively>: Doc fix.
+
+	* xmenu.c (parse_single_submenu): Use individual keymap's prompt
+	string as pane name, if there is one.
+	(set_frame_menubar): Save menu_items_n_panes from each call to
+	parse_single_submenu and use it when calling digest_single_submenu.
+
+	* window.c (window_scroll_pixel_based): Fix check for reaching BEGV.
+	Don't try to make last line fully visible if it is past end of window.
+
 2002-12-22  Steven Tamm  <steventamm@mac.com>
 
 	* macmenu.c (MIN_POPUP_SUBMENU_ID): Added