(apropos-documentation-check-doc-file): Avoid assignment to free variable `doc'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5acc46dafec108c1aabbb11937994a24749d09a7..a40aa7a932f6d6bf46d59b28ecdbf35c03a301c6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2009-09-15  Glenn Morris  <rgm@gnu.org>
+
+       * apropos.el (apropos-documentation-check-doc-file): Avoid assignment to
+       free variable `doc'.
+
+       * dired.el (dired-mode-map): Add menu entry for async shell command.
+
+       * help-fns.el (find-lisp-object-file-name): When looking for autoloaded
+       variables, also consider the .elc files, since the .el files are
+       normally gzipped (subsequent code locates the .el.gz from the .elc).
+
+       * calc/calc-prog.el (arglist): Define for compiler.
+
+       * calendar/diary-lib.el (diary-display-function): Change the default to
+       fancy display.
+       (body): Define for compiler.
+
+       * emacs-lisp/bytecomp.el (byte-compile-keep-pending)
+       (byte-compile-file-form, byte-compile-lambda)
+       (byte-compile-top-level-body, byte-compile-form)
+       (byte-compile-variable-ref, byte-compile-setq)
+       (byte-compile-setq-default, byte-compile-body)
+       (byte-compile-body-do-effect, byte-compile-and, byte-compile-or)
+       (batch-byte-compile): Give some more local variables with common names
+       a "bytecomp-" prefix to avoid masking warnings about free variables.
+
+       * mail/rmailmm.el (rmail-mime-save): If file exists, don't try to be
+       clever and add a suffix to make a unique name, just let the user decide
+       whether or not to overwrite it.  If the input is a directory, write the
+       default filename to that directory.  (Bug#4388)
+       (rmail-mime-bulk-handler): Ensure the save button's 'directory property
+       is a filename-as-a-directory.
+
 2009-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/page.el (what-page): Don't move to beginning of line.

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 117eeb8267e61b09550bc19f775e3835af607eba..f66ba95400ad796aac3ea81d152a1e6d825be167 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -821,7 +821,7 @@ Returns list of symbols and documentation found."
 ;; Finds all documentation related to APROPOS-REGEXP in internal-doc-file-name.
 
 (defun apropos-documentation-check-doc-file ()
-  (let (type symbol (sepa 2) sepb)
+  (let (type symbol (sepa 2) sepb doc)
     (insert ?\^_)
     (backward-char)
     (insert-file-contents (concat doc-directory internal-doc-file-name))