*** empty log message ***

2 files changed, 47 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3705f71c5ef..784e665acfa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2005-09-08  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/sh-script.el (sh-skeleton-pair-default-alist): New var.
+        (sh-mode): Locally set skeleton-pair-default-alist.
+
+        * progmodes/make-mode.el (makefile-add-log-defun): Trim the result.
+
+        * progmodes/flymake.el: Require `compile' unconditionally.
+
+        * mail/sendmail.el (send-mail-function): Add Mailclient alternative.
+
+        * woman.el (woman-file-name): Provide a default, not initial input.
+
+        * smerge-mode.el (smerge-resolve): Pass args to smerge-remove-props.
+
+        * font-lock.el (font-lock-support-mode): Doc fix.
+
+        * descr-text.el (describe-property-list): Handle non-symbol prop names.
+
+2005-08-30  Richard M. Stallman  <rms@gnu.org>
+
+        * simple.el (blink-matching-open): Get rid of text props from
+        the string shown in echo area.  Don't permanently set point.
+        Some rearrangements.
+
+        * files.el (risky-local-variable-p):
+        Match `-predicates' and `-commands.
+
+        * cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
+        (custom-save-all): Visit the file if necessary;
+        kill the buffer if we created it.
+        (custom-save-delete): Don't visit file or kill buffer here.
+
 2005-09-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * recentf.el (recentf-filename-handler): Add custom choice
@@ -65,8 +98,6 @@
         * mouse.el (mouse-drag-header-line): Do nothing if the header-line
         can't be moved; don't signal an error.
 
-        * custom.el (custom-push-theme): Fix last change.
-
 2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
         * cus-theme.el (custom-theme-write-faces): Save the current face
@@ -275,6 +306,16 @@
         (tramp-advice-make-auto-save-file-name): Make defadvice only when
         `make-auto-save-file-name' is not a magic file name operation.
 
+2005-08-30  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (risky-local-variable-p):
+        Match `-predicates' and `-commands.
+
+        * cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
+        (custom-save-all): Visit the file if necessary;
+        kill the buffer if we created it.
+        (custom-save-delete): Don't visit file or kill buffer here.
+
 2005-08-30  Carsten Dominik  <dominik@science.uva.nl>
 
         * textmodes/org.el (org-special-keyword): New face.
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index a16d3c9d6d5..7e603eb63aa 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-08  Richard M. Stallman  <rms@gnu.org>
+
+        * tips.texi (Programming Tips): Correct the "default" prompt spec.
+
 2005-09-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * locals.texi (Standard Buffer-Local Variables): Don't include