merge from trunk

5 files changed, 21 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1713efc07e0..e4bf56d24d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-12  Glenn Morris  <rgm@gnu.org>
 
+        * vc/vc-svn.el (vc-svn-dir-status-files, vc-svn-dir-extra-headers)
+        (vc-svn-ignore, vc-svn-retrieve-tag): Mark unused arguments.
+
         * subr.el (do-after-load-evaluation): Also give compiler warnings
         when obsolete files are used (except by obsolete files).
 
@@ -12,8 +15,7 @@
         * progmodes/cperl-mode.el (Info-find-node):
         * vc/ediff.el (Info-goto-node): Update declarations.
 
-        * vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
-        (vc-compilation-mode): Declare.
+        * vc/vc-bzr.el (vc-compilation-mode): Declare.
         (vc-bzr-pull): Require vc-dispatcher.
         * vc/vc-git.el (vc-compilation-mode): Declare.
         (vc-git-pull): Require vc-dispatcher.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1bf7bb588f0..2eea1fb833e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-12  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-icalendar.el (gnus-icalendar-event--build-reply-event-body):
+        Avoid using `find', which i) might not be defined at runtime;
+        ii) does not work, since its default test is eql, not equal.
+        (gnus-mime-action-alist): Declare.
+
 2013-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * score-mode.el (gnus-score-mode-map): Move initialization
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index a946a586033..e4e1ec29ae9 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -257,9 +257,9 @@ status will be retrieved from the first matching attendee record."
                               ((string= key "ATTENDEE") (update-attendee-status line))
                               ((string= key "SUMMARY") (update-summary line))
                               ((string= key "DTSTAMP") (update-dtstamp))
-                              ((find key '("ORGANIZER" "DTSTART" "DTEND"
-                                           "LOCATION" "DURATION" "SEQUENCE"
-                                           "RECURRENCE-ID" "UID")) line)
+                              ((member key '("ORGANIZER" "DTSTART" "DTEND"
+                                             "LOCATION" "DURATION" "SEQUENCE"
+                                             "RECURRENCE-ID" "UID")) line)
                               (t nil))))
                        (when new-line
                          (push new-line reply-event-lines))))))
@@ -816,6 +816,8 @@ is searched."
   (gnus-icalendar-show-org-agenda
    (with-current-buffer gnus-article-buffer gnus-icalendar-event)))
 
+(defvar gnus-mime-action-alist)         ; gnus-art
+
 (defun gnus-icalendar-setup ()
   (add-to-list 'mm-inlined-types "text/calendar")
   (add-to-list 'mm-automatic-display "text/calendar")
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 3b8643e22f4..00604088c17 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -321,6 +321,7 @@ in the repository root directory of FILE."
   "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.")
 
 ;; To be called via vc-pull from vc.el, which requires vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
 (declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
 (declare-function vc-compilation-mode "vc-dispatcher" (backend))
 
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index bfd608c0467..36f27548123 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -234,12 +234,12 @@ RESULT is a list of conses (FILE . STATE) for directory DIR."
   (vc-run-delayed
    (vc-svn-after-dir-status callback remote))))
 
-(defun vc-svn-dir-status-files (dir files _default-state callback)
+(defun vc-svn-dir-status-files (_dir files _default-state callback)
   (apply 'vc-svn-command (current-buffer) 'async nil "status" files)
   (vc-run-delayed
    (vc-svn-after-dir-status callback)))
 
-(defun vc-svn-dir-extra-headers (dir)
+(defun vc-svn-dir-extra-headers (_dir)
   "Generate extra status headers for a Subversion working copy."
   (let (process-file-side-effects)
     (vc-svn-command "*vc*" 0 nil "info"))
@@ -352,7 +352,7 @@ This is only possible if SVN is responsible for FILE's directory.")
                 (concat "-r" rev))
            (vc-switches 'SVN 'checkout))))
 
-(defun vc-svn-ignore (file &optional directory remove)
+(defun vc-svn-ignore (file &optional _directory _remove)
   "Ignore FILE under Subversion.
 FILE is a file wildcard, relative to the root directory of DIRECTORY."
   (vc-svn-command t 0 file "propedit" "svn:ignore"))
@@ -593,7 +593,7 @@ NAME is assumed to be a URL."
   (vc-svn-command nil 0 dir "copy" name)
   (when branchp (vc-svn-retrieve-tag dir name nil)))
 
-(defun vc-svn-retrieve-tag (dir name update)
+(defun vc-svn-retrieve-tag (dir name _update)
   "Retrieve a tag at and below DIR.
 NAME is the name of the tag; if it is empty, do a `svn update'.
 If UPDATE is non-nil, then update (resynch) any affected buffers.