*** empty log message ***

2 files changed, 40 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0154ff83245..27219563639 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2006-07-12  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/grep.el (grep-last-buffer): Doc fix.
+
+        * info.el (Info-try-follow-nearest-node): Doc fix.
+
+        * emacs-lisp/edebug.el (edebug-instrument-function):
+        Err if find-function-noselect gives no position.
+
+        * emacs-lisp/find-func.el (find-function-search-for-symbol):
+        If can't find definition, return nil for position.
+        (find-function-do-it): Handle new return value
+        of find-definition-noselect.
+        (find-definition-noselect, find-variable-noselect): Doc fix. 
+        (find-function-noselect): Doc fix.
+
+        * help-mode.el (help-variable-def): Handle find-variable-noselect
+        returning no position.
+        (help-function-def): Likewise for find-function-search-for-symbol.
+        (help-face-def): Likewise.
+
+        * help-fns.el (describe-variable): Handle find-variable-noselect
+        returning no position.
+
+        * files.el (locate-file-completion): Avoid duplicates in result.
+
+        * cus-edit.el (custom-no-edit): New command.
+        (custom-mode-map): Remap to custom-no-edit instead of
+        using suppress-keymap.
+
 2006-07-12  Nick Roberts  <nickrob@snap.net.nz>
 
         * tumme.el (tumme-create-thumb)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d43e55c93f5..88bfc32905d 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-12  Richard Stallman  <rms@gnu.org>
+
+        * objects.texi (Frame Type): Explain nature of frames better.
+
+        * frames.texi (Frames): Explain nature of frames better.
+
+2006-07-12  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * tips.texi (Coding Conventions): Explain why use cl at compile time.
+
 2006-07-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * frames.texi (Window System Selections): Mention scrap support for Mac.
@@ -14,11 +24,6 @@
         (sit-for 0) is equivalent to (redisplay).
         Iconifying/deiconifying no longer makes sit-for return.
 
-2006-07-11  Nick Roberts  <nickrob@snap.net.nz>
-
-        * tips.texi (Coding Conventions): Mention macros.
-        Suggested by Ken Manheimer.
-
 2006-07-10  Nick Roberts  <nickrob@snap.net.nz>
 
         * display.texi (Buttons): Fix typo.