4 files changed, 59 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d498d94552d..a9c4c40854d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,46 @@
+2000-08-16  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * loadhist.el (unload-feature): Typo.
+
+        * finder.el (finder-compile-keywords): 
+        * cus-dep.el (custom-make-dependencies): Add local-variable settings
+        to the generated file.
+
+        * mail/mh-e.el (mh-make-local-vars):
+        Replace make-variable-buffer-local with make-local-variable.
+
+        * options.el (Edit-options-{set,toggle,t,nil}):
+        * mail/mailabbrev.el (mail-abbrevs-mode): 
+        * textmodes/tex-mode.el (tex-expand-files): 
+        * textmodes/outline.el (outline-minor-mode): Don't quote lambda.
+
+        * term/bg-mouse.el (bg-mouse-report): screen-height -> frame-height.
+
+        * emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
+        (ewoc-goto-prev, ewoc-goto-next): Remove arg POS.
+        Allow going past the last element.
+        * pcvs.el (cvs-mode-previous-line, cvs-mode-next-line, cvs-mode-mark) 
+        (cvs-mode-unmark-up, cvs-get-marked): Update calls to ewoc.
+        (cvs-mouse-toggle-mark): Don't move point.
+        (cvs-revert-if-needed): Avoid re-eval of local variables and modes.
+
+        * progmodes/compile.el (grep): Provide a default set of files.
+        (next-error): Docstring fix.
+        (compilation-find-file): Avoid find-file (fails in a dedicated window).
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode):
+        Use `symbol-value' to keep the byte-compiler quiet.
+
+        * diff-mode.el (diff-mode-map): Bind diff-apply-hunk.
+        (diff-find-source-location): New fun, extracted from diff-goto-source.
+        (diff-goto-source): Use it.
+        (diff-next-complex-hunk, diff-filter-lines): New function.
+        (diff-apply-hunk): New command.
+
+        * smerge-mode.el (smerge-mode-menu): Doc fix.
+
+        * msb.el (msb-mode): Define it in terms of define-minor-mode.
+
 2000-08-16  Dave Love  <fx@gnu.org>
 
         * play/5x5.el: Doc fixes.
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 4f46fb8c4ff..9cc92e82818 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -5,7 +5,7 @@
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs status tree
 ;; Version: $Name:  $
-;; Revision: $Id: cvs-status.el,v 1.4 2000/05/10 22:08:28 monnier Exp $
+;; Revision: $Id: cvs-status.el,v 1.5 2000/08/06 09:18:02 gerd Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -425,9 +425,9 @@ Optional prefix ARG chooses between two representations."
               ;;(pt (save-excursion (forward-line -1) (point)))
               )
           (setq tags (sort tags 'cvs-tag-lessp))
-          (let* ((first (nth 0 tags))
+          (let* ((first (car tags))
                  (prev (if (cvs-tag-p first)
-                           (list (nth 0 (cvs-tag->vlist first))) nil)))
+                           (list (car (cvs-tag->vlist first))) nil)))
             (cvs-tree-tags-insert tags prev)
             ;;(cvs-refontify pt (point))
             (sit-for 0)))))))
@@ -505,6 +505,9 @@ Optional prefix ARG chooses between two representations."
 
 ;;; Change Log:
 ;; $Log: cvs-status.el,v $
+;; Revision 1.5  2000/08/06 09:18:02  gerd
+;; Use `nth' instead of `first', `second', and `third'.
+;;
 ;; Revision 1.4  2000/05/10 22:08:28  monnier
 ;; (cvs-status-minor-wrap): Use mark-active.
 ;;
diff --git a/lisp/mail/mh-comp.el b/lisp/mail/mh-comp.el
index 5b8828201f2..f7da24e8a8f 100644
--- a/lisp/mail/mh-comp.el
+++ b/lisp/mail/mh-comp.el
@@ -1,7 +1,11 @@
 ;;; mh-comp --- mh-e functions for composing messages
 ;; Time-stamp: <95/08/19 17:48:59 gildea>
 
-;; Copyright (C) 1993, 1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1993,1995,1997,2000  Free Software Foundation, Inc.
+
+;; Maintainer: None
+;; Keywords: mail
+;; Bug-reports: include `M-x mh-version' output in any correspondence
 
 ;; This file is part of mh-e, part of GNU Emacs.
 
@@ -26,7 +30,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-comp.el,v 1.17 2000/04/27 18:56:42 gerd Exp $
+;; $Id: mh-comp.el,v 1.18 2000/06/05 07:15:34 monnier Exp $
 
 ;;; Code:
 
@@ -1002,10 +1006,9 @@ yanked message will be deleted."
          (run-hooks 'mh-yank-hooks))
         (t
          (or (bolp) (forward-line 1))
-         (let ((zmacs-regions nil))     ;so "(mark)" works in XEmacs
-           (while (< (point) (mark))
-             (insert mh-ins-string)
-             (forward-line 1))))))
+         (while (< (point) (mark))
+           (insert mh-ins-string)
+           (forward-line 1)))))
 
 
 (defun mh-fully-kill-draft ()
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 64f92102313..c5ed41d9b48 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -947,7 +947,7 @@ Otherwise call the Doctor to parse preceding sentence."
 (defun doctor-correct-spelling (sent)
   "Correct the spelling and expand each word in sentence."
   (if sent
-      (apply 'append (mapcar '(lambda (word)
+      (apply 'append (mapcar (lambda (word)
                                 (if (memq word typos)
                                     (get (get word 'doctor-correction) 'doctor-expansion)
                                   (list word)))