3 files changed, 40 insertions, 0 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index c9dba8cc2d4..0033cfa0cbd 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -49,6 +49,8 @@ Windows only bug.
 
 ** hukeli@gmail.com and pumcma@yahoo.com.cn Chinese input method problem. 
 
+** jidanni Sep 28 "makefile comment colors permanent".
+
 ** C-p works properly with fields within the line, but C-n does not.
 (ken.manheimer@gmail.com, Sep 24.)
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index f42f62a3332..69e56437ef0 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -833,6 +833,11 @@ feature (in the font part of the configuration window).
 
 * Internationalization problems
 
+** M-{ does not work on a Spanish PC keyboard.
+
+Many Spanish keyboards seem to ignore that combination.  Emacs can't
+do anything about it.
+
 ** Characters from the mule-unicode charsets aren't displayed under X.
 
 XFree86 4 contains many fonts in iso10646-1 encoding which have
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c34c213990b..3555287724f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-28  Richard Stallman  <rms@gnu.org>
+
+        * comint.el (comint-mode): Bind font-lock-defaults non-nil.
+
+        * subr.el (insert-for-yank-1): Handle `font-lock-face' specially.
+
+        * international/mule.el (after-insert-file-set-coding): 
+        If VISIT, don't let set-buffer-multibyte make undo info.
+        
 2006-09-28  Osamu Yamane  <yamane@green.ocn.ne.jp> (tiny change)
 
         * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
@@ -29,12 +38,36 @@
         * subr.el (shell-quote-argument): Use DOS logic for Windows
         shells with DOS semantics.
 
+2006-09-24  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/compile.el (compilation-goto-locus-delete-o): New fn.
+        (compilation-goto-locus): Use compilation-goto-locus-delete-o
+        to delete the overlay.  Put it on pre-command-hook.
+
+        * emacs-lisp/timer.el (timer-max-repeats): Doc fix.
+
+        * startup.el (fancy-splash-screens, normal-splash-screen): 
+        Call the splash buffer *About GNU Emacs*.
+
+        * simple.el (next-error-highlight, next-error-highlight-no-select): 
+        Default to 0.5.
+        (yank-excluded-properties): Add `fontified'.
+
+        * font-lock.el (font-lock-compile-keywords): Allow value of
+        syntax-begin-function to enable paren-column-0 highlighting.
+
+2006-09-24  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+        * dired.el (dired-build-subdir-alist): When file ends in colon,
+        don't exit the loop, just disregard that file.
+
 2006-09-24  Chong Yidong  <cyd@stupidchicken.com>
 
         * simple.el (line-move-finish): Handle corner case for fields in
         continued lines.
         (line-move-1): Remove flawed test for that case.
 
+>>>>>>> 1.10122
 2006-09-24  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * icomplete.el (icomplete-simple-completing-p): Use the correct