merge from trunk

4 files changed, 16 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7e08e40480..06c30cdb624 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2013-09-11  Glenn Morris  <rgm@gnu.org>
 
+        * echistory.el (electric-command-history): Remove call to deleted func.
+
+        * play/landmark.el (landmark-mode): Fix typos.
+
+        * vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.
+        Check cvs-sort-ignore-file is bound.
+
         * savehist.el: No need for cl when compiling on Emacs.
 
 2013-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -56,6 +63,7 @@
         * chistory.el (command-history-mode-map): Rename from
         command-history-map.
         (command-history-mode): Use define-derived-mode.
+        (Command-history-setup): Remove function.
         * calc/calc.el (calc-trail-mode-map): New var.
         (calc-trail-mode): Use define-derived-mode.
         (calc-trail-buffer): Set calc-main-buffer manually.
diff --git a/lisp/echistory.el b/lisp/echistory.el
index fc576aa6484..5989c9b8445 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -117,7 +117,6 @@ The Command History listing is recomputed each time this mode is invoked."
                   (save-window-excursion
                     (list-command-history)
                     (set-buffer "*Command History*")
-                    (Command-history-setup)
                     (setq major-mode 'electric-command-history)
                     (setq mode-name "Electric History")
                     (use-local-map electric-history-map))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index b995da4513c..8ee633e3917 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -233,7 +233,7 @@
 (put 'landmark-mode 'intangible 1)
 ;; This one is for when they set view-read-only to t: Landmark cannot
 ;; allow View Mode to be activated in its buffer.
-(define-derived-mode lm-mode special-mode "Lm"
+(define-derived-mode landmark-mode special-mode "Lm"
   "Major mode for playing Lm against Emacs.
 You and Emacs play in turn by marking a free square.  You mark it with X
 and Emacs marks it with O.  The winner is the first to get five contiguous
@@ -245,8 +245,8 @@ Other useful commands:
 \\{landmark-mode-map}
 Entry to this mode calls the value of `landmark-mode-hook' if that value
 is non-nil.  One interesting value is `turn-on-font-lock'."
-  (lm-display-statistics)
-  (setq-local font-lock-defaults '(lm-font-lock-keywords t))
+  (landmark-display-statistics)
+  (setq-local font-lock-defaults '(landmark-font-lock-keywords t))
   (setq buffer-read-only t))
 
 
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 931193c46e0..11a30991391 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -1226,10 +1226,11 @@ is non-nil."
                    table (lambda () (vc-cvs-revision-table (car files))))))
     table))
 
-(defun vc-cvs-ignore (file)
+(defun vc-cvs-ignore (file &optional _directory _remove)
   "Ignore FILE under CVS."
   (cvs-append-to-ignore (file-name-directory file) file))
 
+;; FIXME This should be in the vc-cvs- namespace if it is to live here.
 (defun cvs-append-to-ignore (dir str &optional old-dir)
   "In DIR, add STR to the .cvsignore file.
 If OLD-DIR is non-nil, then this is a directory that we don't want
@@ -1245,7 +1246,9 @@ to hear about anymore."
     (goto-char (point-max))
     (unless (bolp) (insert "\n"))
     (insert str (if old-dir "/\n" "\n"))
-    (if cvs-sort-ignore-file (sort-lines nil (point-min) (point-max)))
+    ;; FIXME this is a pcvs variable.
+    (if (bound-and-true-p cvs-sort-ignore-file)
+        (sort-lines nil (point-min) (point-max)))
     (save-buffer)))
 
 (provide 'vc-cvs)