Now on revision 112767.
------------------------------------------------------------
revno: 112767
committer: Leo Liu <sdl.web@gmail.com>
branch nick: trunk
timestamp: Wed 2013-05-29 14:50:48 +0800
message:
  * lisp/emacs-lisp/smie.el (smie-highlight-matching-block): Always turn
  off the highlight first.
  
  * lisp/progmodes/octave.el (octave-indent-comment): Tweak regexps.
  (octave-help): Small simplification.
  
  * test/indent/octave.m: Tweak.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-29 06:44:19 +0000
+++ lisp/ChangeLog	2013-05-29 06:50:48 +0000
@@ -1,3 +1,11 @@
+2013-05-29  Leo Liu  <sdl.web@gmail.com>
+
+	* progmodes/octave.el (octave-indent-comment): Tweak regexps.
+	(octave-help): Small simplification.
+
+	* emacs-lisp/smie.el (smie-highlight-matching-block): Always turn
+	off the highlight first.
+
 2013-05-29  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/idlwave.el (idlwave-scan-user-lib-files)

=== modified file 'lisp/emacs-lisp/smie.el'
--- lisp/emacs-lisp/smie.el	2013-05-24 19:37:55 +0000
+++ lisp/emacs-lisp/smie.el	2013-05-29 06:50:48 +0000
@@ -1060,10 +1060,10 @@
                            beg end (current-buffer))
              (overlay-put smie--highlight-matching-block-overlay
                           'face 'smie-matching-block-highlight))))
-      (save-excursion
-        (condition-case nil
-            (if (nth 8 (syntax-ppss))
-                (overlay-put smie--highlight-matching-block-overlay 'face nil)
+      (overlay-put smie--highlight-matching-block-overlay 'face nil)
+      (unless (nth 8 (syntax-ppss))
+        (save-excursion
+          (condition-case nil
               (let ((token
                      (or (funcall beg-of-tok)
                          (funcall beg-of-tok
@@ -1082,11 +1082,8 @@
                   (let ((beg (point))
                         (opener (funcall smie-forward-token-function)))
                     (when (assoc opener smie-closer-alist)
-                      (funcall highlight beg (point)))))
-                 (t (overlay-put smie--highlight-matching-block-overlay
-                                 'face nil)))))
-          (scan-error
-           (overlay-put smie--highlight-matching-block-overlay 'face nil)))))))
+                      (funcall highlight beg (point)))))))
+            (scan-error)))))))
 
 (defvar smie--highlight-matching-block-timer nil)
 

=== modified file 'lisp/progmodes/octave.el'
--- lisp/progmodes/octave.el	2013-05-27 05:08:04 +0000
+++ lisp/progmodes/octave.el	2013-05-29 06:50:48 +0000
@@ -446,11 +446,11 @@
     (back-to-indentation)
     (cond
      ((octave-in-string-or-comment-p) nil)
-     ((looking-at-p "\\s<\\{3,\\}")
+     ((looking-at-p "\\(\\s<\\)\\1\\{2,\\}")
       0)
      ;; Exclude %{, %} and %!.
      ((and (looking-at-p "\\s<\\(?:[^{}!]\\|$\\)")
-           (not (looking-at-p "\\s<\\s<")))
+           (not (looking-at-p "\\(\\s<\\)\\1")))
       (comment-choose-indent)))))
 
 
@@ -1637,8 +1637,7 @@
         ;; Make 'See also' clickable
         (with-syntax-table octave-mode-syntax-table
           (when (re-search-forward "^\\s-*See also:" nil t)
-            (let ((end (or (save-excursion (re-search-forward "^\\s-*$" nil t))
-                           (point-max))))
+            (let ((end (save-excursion (re-search-forward "^\\s-*$" nil t))))
               (while (re-search-forward "\\_<\\(?:\\sw\\|\\s_\\)+\\_>" end t)
                 (make-text-button (match-beginning 0)
                                   ;; If the match ends with . exclude it.

=== modified file 'test/ChangeLog'
--- test/ChangeLog	2013-05-26 07:54:01 +0000
+++ test/ChangeLog	2013-05-29 06:50:48 +0000
@@ -1,3 +1,7 @@
+2013-05-29  Leo Liu  <sdl.web@gmail.com>
+
+	* indent/octave.m: Tweak.
+
 2013-05-26  Aidan Gauland  <aidalgol@amuri.net>
 
 	* tests/eshell.el: Rewrite tests using ERT.

=== modified file 'test/indent/octave.m'
--- test/indent/octave.m	2013-05-25 02:03:03 +0000
+++ test/indent/octave.m	2013-05-29 06:50:48 +0000
@@ -2311,7 +2311,7 @@
       ext(end) = [];
     else
       isglob = false;		# I am a test
-				# me too
+				#%% me too
 ### I shall align to column 0
     endif
     pos = findstr (nm, ext);
------------------------------------------------------------
revno: 112766
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 23:44:19 -0700
message:
  * idlwave.el (idlwave-scan-user-lib-files, idlwave-write-paths): Simplify
  via with-temp-buffer.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-29 02:48:16 +0000
+++ lisp/ChangeLog	2013-05-29 06:44:19 +0000
@@ -1,5 +1,8 @@
 2013-05-29  Glenn Morris  <rgm@gnu.org>
 
+	* progmodes/idlwave.el (idlwave-scan-user-lib-files)
+	(idlwave-write-paths): Simplify via with-temp-buffer.
+
 	* emulation/cua-gmrk.el: Also load cua-base, cua-rect at run time.
 	* emulation/cua-rect.el: Also load cua-base at run time.
 

=== modified file 'lisp/progmodes/idlwave.el'
--- lisp/progmodes/idlwave.el	2013-03-12 02:08:21 +0000
+++ lisp/progmodes/idlwave.el	2013-05-29 06:44:19 +0000
@@ -5481,30 +5481,21 @@
     (message "Creating user catalog file...")
     (kill-buffer "*idlwave-scan.pro*")
     (kill-buffer (get-buffer-create "*IDLWAVE Widget*"))
-    (let ((font-lock-maximum-size 0)
-	  (auto-mode-alist nil))
-      (find-file idlwave-user-catalog-file))
-    (if (and (boundp 'font-lock-mode)
-	     font-lock-mode)
-	(font-lock-mode 0))
-    (erase-buffer)
-    (insert ";; IDLWAVE user catalog file\n")
-    (insert (format ";; Created %s\n\n" (current-time-string)))
+    (with-temp-buffer
+      (insert ";; IDLWAVE user catalog file\n")
+      (insert (format ";; Created %s\n\n" (current-time-string)))
 
-    ;; Define the routine info list
-    (insert "\n(setq idlwave-user-catalog-routines\n    '(")
-    (let ((standard-output (current-buffer)))
-      (mapc (lambda (x)
-	      (insert "\n    ")
-	      (prin1 x)
-	      (goto-char (point-max)))
-	    idlwave-user-catalog-routines))
-    (insert (format "))\n\n;;; %s ends here\n"
-		    (file-name-nondirectory idlwave-user-catalog-file)))
-    (goto-char (point-min))
-    ;; Save the buffer
-    (save-buffer 0)
-    (kill-buffer (current-buffer)))
+      ;; Define the routine info list
+      (insert "\n(setq idlwave-user-catalog-routines\n    '(")
+      (let ((standard-output (current-buffer)))
+	(mapc (lambda (x)
+		(insert "\n    ")
+		(prin1 x)
+		(goto-char (point-max)))
+	      idlwave-user-catalog-routines))
+      (insert (format "))\n\n;;; %s ends here\n"
+		      (file-name-nondirectory idlwave-user-catalog-file)))
+      (write-region nil nil idlwave-user-catalog-file)))
   (message "Creating user catalog file...done")
   (message "Info for %d routines saved in %s"
 	   (length idlwave-user-catalog-routines)
@@ -5522,31 +5513,23 @@
 (defun idlwave-write-paths ()
   (interactive)
   (when (and idlwave-path-alist idlwave-system-directory)
-    (let ((font-lock-maximum-size 0)
-	  (auto-mode-alist nil))
-      (find-file idlwave-path-file))
-    (if (and (boundp 'font-lock-mode)
-	     font-lock-mode)
-	(font-lock-mode 0))
-    (erase-buffer)
-    (insert ";; IDLWAVE paths\n")
-    (insert (format ";; Created %s\n\n" (current-time-string)))
+    (with-temp-buffer
+      (insert ";; IDLWAVE paths\n")
+      (insert (format ";; Created %s\n\n" (current-time-string)))
     ;; Define the variable which knows the value of "!DIR"
-    (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
-		    idlwave-system-directory))
-
-    ;; Define the variable which contains a list of all scanned directories
-    (insert "\n(setq idlwave-path-alist\n    '(")
-    (let ((standard-output (current-buffer)))
-      (mapc (lambda (x)
-	      (insert "\n      ")
-	      (prin1 x)
-	      (goto-char (point-max)))
-	    idlwave-path-alist))
-    (insert "))\n")
-    (save-buffer 0)
-    (kill-buffer (current-buffer))))
-
+      (insert (format "\n(setq idlwave-system-directory \"%s\")\n"
+		      idlwave-system-directory))
+
+      ;; Define the variable which contains a list of all scanned directories
+      (insert "\n(setq idlwave-path-alist\n    '(")
+      (let ((standard-output (current-buffer)))
+	(mapc (lambda (x)
+		(insert "\n      ")
+		(prin1 x)
+		(goto-char (point-max)))
+	      idlwave-path-alist))
+      (insert "))\n")
+      (write-region nil nil idlwave-path-file))))
 
 (defun idlwave-expand-path (path &optional default-dir)
   ;; Expand parts of path starting with '+' recursively into directory list.
------------------------------------------------------------
revno: 112765
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 19:48:16 -0700
message:
  Silence cua-mode compilation
  
  * emulation/cua-gmrk.el: Also load cua-base, cua-rect at run time.
  * emulation/cua-rect.el: Also load cua-base at run time.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-29 02:46:35 +0000
+++ lisp/ChangeLog	2013-05-29 02:48:16 +0000
@@ -1,5 +1,8 @@
 2013-05-29  Glenn Morris  <rgm@gnu.org>
 
+	* emulation/cua-gmrk.el: Also load cua-base, cua-rect at run time.
+	* emulation/cua-rect.el: Also load cua-base at run time.
+
 	* progmodes/cperl-mode.el (imenu-choose-buffer-index)
 	(file-of-tag, etags-snarf-tag, etags-goto-tag-location): Declare.
 	(cperl-imenu-on-info): Require imenu.

=== modified file 'lisp/emulation/cua-gmrk.el'
--- lisp/emulation/cua-gmrk.el	2013-01-01 09:11:05 +0000
+++ lisp/emulation/cua-gmrk.el	2013-05-29 02:48:16 +0000
@@ -25,10 +25,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cua-base)
-  (require 'cua-rect)
-  )
+(require 'cua-base)
+(require 'cua-rect)
 
 ;;; Global Marker
 

=== modified file 'lisp/emulation/cua-rect.el'
--- lisp/emulation/cua-rect.el	2013-01-01 09:11:05 +0000
+++ lisp/emulation/cua-rect.el	2013-05-29 02:48:16 +0000
@@ -31,8 +31,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cua-base))
+(require 'cua-base)
 
 ;;; Rectangle support
------------------------------------------------------------
revno: 112764
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 19:46:35 -0700
message:
  Silence cperl-mode compilation
  
  * progmodes/cperl-mode.el (imenu-choose-buffer-index)
  (file-of-tag, etags-snarf-tag, etags-goto-tag-location): Declare.
  (cperl-imenu-on-info): Require imenu.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-28 15:42:56 +0000
+++ lisp/ChangeLog	2013-05-29 02:46:35 +0000
@@ -1,3 +1,9 @@
+2013-05-29  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/cperl-mode.el (imenu-choose-buffer-index)
+	(file-of-tag, etags-snarf-tag, etags-goto-tag-location): Declare.
+	(cperl-imenu-on-info): Require imenu.
+
 2013-05-28  Alan Mackenzie  <acm@muc.de>
 
 	Handle "capitalised keywords" correctly.

=== modified file 'lisp/progmodes/cperl-mode.el'
--- lisp/progmodes/cperl-mode.el	2013-05-24 06:57:39 +0000
+++ lisp/progmodes/cperl-mode.el	2013-05-29 02:46:35 +0000
@@ -6671,10 +6671,13 @@
   (buffer-substring
    (match-beginning 1) (match-end 1)))
 
+(declare-function imenu-choose-buffer-index "imenu" (&optional prompt alist))
+
 (defun cperl-imenu-on-info ()
   "Shows imenu for Perl Info Buffer.
 Opens Perl Info buffer if needed."
   (interactive)
+  (require 'imenu)
   (let* ((buffer (current-buffer))
 	 imenu-create-index-function
 	 imenu-prev-index-position-function
@@ -7134,6 +7137,10 @@
 (defvar cperl-hierarchy '(() ())
   "Global hierarchy of classes.")
 
+;; Follows call to (autoloaded) visit-tags-table.
+(declare-function file-of-tag "etags" (&optional relative))
+(declare-function etags-snarf-tag "etags" (&optional use-explicit))
+
 (defun cperl-tags-hier-fill ()
   ;; Suppose we are in a tag table cooked by cperl.
   (goto-char 1)
@@ -7177,6 +7184,7 @@
       (end-of-line))))
 
 (declare-function x-popup-menu "menu.c" (position menu))
+(declare-function etags-goto-tag-location "etags" (tag-info))
 
 (defun cperl-tags-hier-init (&optional update)
   "Show hierarchical menu of classes and methods.
------------------------------------------------------------
revno: 112763
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 19:40:43 -0700
message:
  Silence some gnus compilation warnings
  
  * gnus/gnus-ems.el (set-process-plist): Every supported Emacs has this.
  
  * gnus/gnus-group.el (gnus-sequence-of-unread-articles)
  (gnus-summary-add-mark, gnus-mark-article-as-read)
  (gnus-group-make-articles-read): Declare.
  
  * gnus/gnus-sum.el (gnus-parameter-list-identifier)
  (gnus-article-stop-animations, gnus-stop-downloads)
  (gnus-article-only-boring-p, article-goto-body)
  (gnus-flush-original-article-buffer, article-narrow-to-head)
  (gnus-article-hidden-text-p, gnus-delete-wash-type)
  (gnus-summary-save-in-pipe, gnus-article-show-summary): Declare.
  
  * gnus/gnus.el: No need to eval-and-compile autoloads.
  
  * gnus/gravatar.el (help-function-arglist): Autoload.
  
  * gnus/nnimap.el (gnus-refer-thread-use-nnir): Declare.
  
  * gnus/nnmail.el (nnmail-fancy-expiry-target): Maybe use mail-dont-reply-to.
  
  * gnus/spam.el: No need to load spam-report when compiling.
  No need to eval-and-compile autoloads.
  (spam-report-resend-to): Declare.
  (spam-report-resend-register-routine): Require 'spam-report.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2013-05-24 14:36:12 +0000
+++ lisp/gnus/ChangeLog	2013-05-29 02:40:43 +0000
@@ -1,3 +1,31 @@
+2013-05-29  Glenn Morris  <rgm@gnu.org>
+
+	* gnus-ems.el (set-process-plist): Every supported Emacs has this.
+
+	* gnus-group.el (gnus-sequence-of-unread-articles)
+	(gnus-summary-add-mark, gnus-mark-article-as-read)
+	(gnus-group-make-articles-read): Declare.
+
+	* gnus-sum.el (gnus-parameter-list-identifier)
+	(gnus-article-stop-animations, gnus-stop-downloads)
+	(gnus-article-only-boring-p, article-goto-body)
+	(gnus-flush-original-article-buffer, article-narrow-to-head)
+	(gnus-article-hidden-text-p, gnus-delete-wash-type)
+	(gnus-summary-save-in-pipe, gnus-article-show-summary): Declare.
+
+	* gnus.el: No need to eval-and-compile autoloads.
+
+	* gravatar.el (help-function-arglist): Autoload.
+
+	* nnimap.el (gnus-refer-thread-use-nnir): Declare.
+
+	* nnmail.el (nnmail-fancy-expiry-target): Maybe use mail-dont-reply-to.
+
+	* spam.el: No need to load spam-report when compiling.
+	No need to eval-and-compile autoloads.
+	(spam-report-resend-to): Declare.
+	(spam-report-resend-register-routine): Require 'spam-report.
+
 2013-05-24  Julien Danjou  <julien@danjou.info>
 
 	* sieve.el (sieve-setup-buffer): Fix default port value in sieve buffer

=== modified file 'lisp/gnus/gnus-ems.el'
--- lisp/gnus/gnus-ems.el	2013-01-01 09:11:05 +0000
+++ lisp/gnus/gnus-ems.el	2013-05-29 02:40:43 +0000
@@ -221,8 +221,8 @@
         'window-inside-pixel-edges
       'window-pixel-edges))
 
-  (if (fboundp 'set-process-plist)
-      (progn
+  (if (or (featurep 'emacs) (fboundp 'set-process-plist))
+      (progn				; these exist since Emacs 22.1
 	(defalias 'gnus-set-process-plist 'set-process-plist)
 	(defalias 'gnus-process-plist 'process-plist)
 	(defalias 'gnus-process-get 'process-get)

=== modified file 'lisp/gnus/gnus-group.el'
--- lisp/gnus/gnus-group.el	2013-02-13 04:31:09 +0000
+++ lisp/gnus/gnus-group.el	2013-05-29 02:40:43 +0000
@@ -3591,6 +3591,8 @@
   (interactive "P")
   (gnus-group-catchup-current n 'all))
 
+(declare-function gnus-sequence-of-unread-articles "gnus-sum" (group))
+
 (defun gnus-group-catchup (group &optional all)
   "Mark all articles in GROUP as read.
 If ALL is non-nil, all articles are marked as read.
@@ -4493,6 +4495,8 @@
 		     (sort (nconc (gnus-uncompress-range (cdr m))
 				  (copy-sequence articles)) '<) t))))))
 
+(declare-function gnus-summary-add-mark "gnus-sum" (article type))
+
 (defun gnus-add-mark (group mark article)
   "Mark ARTICLE in GROUP with MARK, whether the group is displayed or not."
   (let ((buffer (gnus-summary-buffer-name group)))
@@ -4657,6 +4661,9 @@
   (let ((gnus-group-list-option 'limit))
     (gnus-group-list-plus args)))
 
+(declare-function gnus-mark-article-as-read "gnu-sum" (article &optional mark))
+(declare-function gnus-group-make-articles-read "gnus-sum" (group articles))
+
 (defun gnus-group-mark-article-read (group article)
   "Mark ARTICLE read."
   (let ((buffer (gnus-summary-buffer-name group))

=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el	2013-05-04 22:38:05 +0000
+++ lisp/gnus/gnus-sum.el	2013-05-29 02:40:43 +0000
@@ -5492,6 +5492,8 @@
 	 (cdr (assq number gnus-newsgroup-scored))
 	 (memq number gnus-newsgroup-processable))))))
 
+(declare-function gnus-parameter-list-identifier "gnus-art" (name) t)
+
 (defun gnus-group-get-list-identifiers (group)
   "Get list identifier regexp for GROUP."
   (or (gnus-parameter-list-identifier group)
@@ -7267,6 +7269,9 @@
       (unless quit-config
 	(setq gnus-newsgroup-name nil)))))
 
+(declare-function gnus-article-stop-animations "gnus-art" ())
+(declare-function gnus-stop-downloads "gnus-art" ())
+
 (defalias 'gnus-summary-quit 'gnus-summary-exit-no-update)
 (defun gnus-summary-exit-no-update (&optional no-questions)
   "Quit reading current newsgroup without updating read article info."
@@ -7859,6 +7864,8 @@
    (and gnus-auto-select-same
 	(gnus-summary-article-subject))))
 
+(declare-function gnus-article-only-boring-p "gnus-art" ())
+
 (defun gnus-summary-next-page (&optional lines circular stop)
   "Show next page of the selected article.
 If at the end of the current article, select the next article.
@@ -8426,6 +8433,8 @@
   (interactive "sMatch headers (regexp): \nP")
   (gnus-summary-limit-to-bodies match reverse t))
 
+(declare-function article-goto-body "gnus-art" ())
+
 (defun gnus-summary-limit-to-bodies (match &optional reverse headersp)
   "Limit the summary buffer to articles that have bodies that match MATCH.
 If REVERSE (the prefix), limit to articles that don't match."
@@ -9556,6 +9565,8 @@
 	  (ps-spool-buffer-with-faces)
 	(ps-spool-buffer)))))
 
+(declare-function gnus-flush-original-article-buffer "gnus-art" ())
+
 (defun gnus-summary-show-complete-article ()
   "Show a complete version of the current article.
 This is only useful if you're looking at a partial version of the
@@ -9679,6 +9690,10 @@
 	       t)))
   (gnus-summary-show-article))
 
+(declare-function article-narrow-to-head "gnus-art" ())
+(declare-function gnus-article-hidden-text-p "gnus-art" (type))
+(declare-function gnus-delete-wash-type "gnus-art" (type))
+
 (defun gnus-summary-toggle-header (&optional arg)
   "Show the headers if they are hidden, or hide them if they are shown.
 If ARG is a positive number, show the entire header.
@@ -11962,6 +11977,8 @@
     (gnus-set-mode-line 'summary)
     n))
 
+(declare-function gnus-summary-save-in-pipe "gnus-art" (&optional command raw))
+
 (defun gnus-summary-pipe-output (&optional n sym)
   "Pipe the current article to a subprocess.
 If N is a positive number, pipe the N next articles.
@@ -12914,6 +12931,7 @@
   (gnus-summary-position-point))
 
 ;;; Bookmark support for Gnus.
+(declare-function gnus-article-show-summary "gnus-art" ())
 (declare-function bookmark-make-record-default
                   "bookmark" (&optional no-file no-context posn))
 (declare-function bookmark-prop-get "bookmark" (bookmark prop))

=== modified file 'lisp/gnus/gnus.el'
--- lisp/gnus/gnus.el	2013-05-09 01:40:20 +0000
+++ lisp/gnus/gnus.el	2013-05-29 02:40:43 +0000
@@ -4243,8 +4243,7 @@
       (setq valids (cdr valids)))
     outs))
 
-(eval-and-compile
-  (autoload 'message-y-or-n-p "message" nil nil 'macro))
+(autoload 'message-y-or-n-p "message" nil nil 'macro)
 
 (defun gnus-read-group (prompt &optional default)
   "Prompt the user for a group name.

=== modified file 'lisp/gnus/gravatar.el'
--- lisp/gnus/gravatar.el	2013-01-01 09:11:05 +0000
+++ lisp/gnus/gravatar.el	2013-05-29 02:40:43 +0000
@@ -103,6 +103,8 @@
 	(gravatar-create-image data nil t)
       'error)))
 
+(autoload 'help-function-arglist "help-fns")
+
 ;;;###autoload
 (defun gravatar-retrieve (mail-address cb &optional cbargs)
   "Retrieve MAIL-ADDRESS gravatar and call CB on retrieval.

=== modified file 'lisp/gnus/nnimap.el'
--- lisp/gnus/nnimap.el	2013-01-15 04:26:28 +0000
+++ lisp/gnus/nnimap.el	2013-05-29 02:40:43 +0000
@@ -1642,6 +1642,7 @@
   (setq nnimap-status-string "Read-only server")
   nil)
 
+(defvar gnus-refer-thread-use-nnir)	; gnus-sum
 (declare-function gnus-fetch-headers "gnus-sum"
 		  (articles &optional limit force-new dependencies))
 

=== modified file 'lisp/gnus/nnmail.el'
--- lisp/gnus/nnmail.el	2013-02-12 17:36:54 +0000
+++ lisp/gnus/nnmail.el	2013-05-29 02:40:43 +0000
@@ -1954,7 +1954,9 @@
 		 (and (string-match (cadr regexp-target-pair) to)
 		      (let ((rmail-dont-reply-to-names
 			     (message-dont-reply-to-names)))
-			(equal (rmail-dont-reply-to from) "")))))
+			(equal (if (fboundp 'rmail-dont-reply-to)
+				   (rmail-dont-reply-to from)
+				 (mail-dont-reply-to from)) "")))))
 	(setq target (format-time-string (caddr regexp-target-pair) date)))
        ((and (not (equal header 'to-from))
 	     (string-match (cadr regexp-target-pair)

=== modified file 'lisp/gnus/spam.el'
--- lisp/gnus/spam.el	2013-05-09 01:40:20 +0000
+++ lisp/gnus/spam.el	2013-05-29 02:40:43 +0000
@@ -50,7 +50,6 @@
 ;;; for the definitions of group content classification and spam processors
 (require 'gnus)
 
-(eval-when-compile (require 'spam-report))
 (eval-when-compile (require 'hashcash))
 
 ;; for nnimap-split-download-body-default
@@ -60,11 +59,10 @@
 (autoload 'query-dig "dig")
 
 ;; autoload spam-report
-(eval-and-compile
-  (autoload 'spam-report-gmane "spam-report")
-  (autoload 'spam-report-gmane-spam "spam-report")
-  (autoload 'spam-report-gmane-ham "spam-report")
-  (autoload 'spam-report-resend "spam-report"))
+(autoload 'spam-report-gmane "spam-report")
+(autoload 'spam-report-gmane-spam "spam-report")
+(autoload 'spam-report-gmane-ham "spam-report")
+(autoload 'spam-report-resend "spam-report")
 
 ;; autoload gnus-registry
 (autoload 'gnus-registry-group-count "gnus-registry")
@@ -2473,7 +2471,10 @@
 (defun spam-report-resend-register-ham-routine (articles)
   (spam-report-resend-register-routine articles t))
 
+(defvar spam-report-resend-to)
+
 (defun spam-report-resend-register-routine (articles &optional ham)
+  (require 'spam-report)
   (let* ((resend-to-gp
           (if ham
               (gnus-parameter-ham-resend-to gnus-newsgroup-name)
------------------------------------------------------------
revno: 112762
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8447
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Tue 2013-05-28 21:07:53 -0400
message:
  * src/fileio.c (Finsert_file_contents): Preserve undo info when reverting
  a buffer.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2013-05-27 16:54:33 +0000
+++ src/ChangeLog	2013-05-29 01:07:53 +0000
@@ -1,3 +1,8 @@
+2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (Finsert_file_contents): Preserve undo info when reverting
+	a buffer (bug#8447).
+
 2013-05-27  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
@@ -25,8 +30,8 @@
 	(struct MonitorInfo): New struct.
 	(free_monitors, make_monitor_attribute_list): Declare.
 
-	* frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): New
-	Lisp_Object:s.
+	* frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource):
+	New Lisp_Object:s.
 	(free_monitors, make_monitor_attribute_list): New functions.
 	(syms_of_frame): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes,
 	Qsource.

=== modified file 'src/fileio.c'
--- src/fileio.c	2013-05-18 05:32:17 +0000
+++ src/fileio.c	2013-05-29 01:07:53 +0000
@@ -3506,6 +3506,11 @@
   bool set_coding_system = 0;
   Lisp_Object coding_system;
   bool read_quit = 0;
+  /* If the undo log only contains the insertion, there's no point
+     keeping it.  It's typically when we first fill a file-buffer.  */
+  bool empty_undo_list_p
+    = (!NILP (visit) && NILP (BVAR (current_buffer, undo_list))
+       && BEG == Z);
   Lisp_Object old_Vdeactivate_mark = Vdeactivate_mark;
   bool we_locked_file = 0;
   bool deferred_remove_unwind_protect = 0;
@@ -4108,6 +4113,7 @@
 	{
 	  del_range_byte (same_at_start, same_at_end, 0);
 	  temp = GPT;
+	  eassert (same_at_start == GPT_BYTE);
 	  same_at_start = GPT_BYTE;
 	}
       else
@@ -4120,6 +4126,7 @@
 	= buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
 				  same_at_start - BEGV_BYTE
 				  + BUF_BEG_BYTE (XBUFFER (conversion_buffer)));
+      eassert (same_at_start_charpos == temp - (BEGV - BEG));
       inserted_chars
 	= (buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
 				   same_at_start + inserted - BEGV_BYTE
@@ -4404,7 +4411,7 @@
 
   if (!NILP (visit))
     {
-      if (!EQ (BVAR (current_buffer, undo_list), Qt) && !nochange)
+      if (empty_undo_list_p)
 	bset_undo_list (current_buffer, Qnil);
 
       if (NILP (handler))
@@ -4546,7 +4553,7 @@
 	  p = XCDR (p);
 	}
 
-      if (NILP (visit))
+      if (!empty_undo_list_p)
 	{
 	  bset_undo_list (current_buffer, old_undo);
 	  if (CONSP (old_undo) && inserted != old_inserted)
------------------------------------------------------------
revno: 112761
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11782
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Tue 2013-05-28 20:24:50 -0400
message:
  * doc/lispref/functions.texi (Lambda Expressions): Lambda expressions don't
  evaluate to themselves in general.
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2013-05-15 20:12:53 +0000
+++ doc/lispref/ChangeLog	2013-05-29 00:24:50 +0000
@@ -1,3 +1,8 @@
+2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* functions.texi (Lambda Expressions): Lambda expressions don't
+	evaluate to themselves in general (bug#11782).
+
 2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* loading.texi (Autoload):

=== modified file 'doc/lispref/functions.texi'
--- doc/lispref/functions.texi	2013-01-01 09:11:05 +0000
+++ doc/lispref/functions.texi	2013-05-29 00:24:50 +0000
@@ -196,9 +196,8 @@
 @end example
 
 @noindent
-In Emacs Lisp, such a list is valid as an expression---it evaluates to
-itself.  But its main use is not to be evaluated as an expression, but
-to be called as a function.
+In Emacs Lisp, such a list is a valid expression which evaluates to
+a function object.
 
   A lambda expression, by itself, has no name; it is an @dfn{anonymous
 function}.  Although lambda expressions can be used this way
------------------------------------------------------------
revno: 112760
committer: Alan Mackenzie <acm@muc.de>
branch nick: trunk
timestamp: Tue 2013-05-28 15:42:56 +0000
message:
          Handle "capitalised keywords" correctly.
          * progmodes/cc-mode.el (c-after-change): bind case-fold-search to
          nil.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-28 10:22:03 +0000
+++ lisp/ChangeLog	2013-05-28 15:42:56 +0000
@@ -1,3 +1,9 @@
+2013-05-28  Alan Mackenzie  <acm@muc.de>
+
+	Handle "capitalised keywords" correctly.
+	* progmodes/cc-mode.el (c-after-change): bind case-fold-search to
+	nil.
+
 2013-05-28  Aidan Gauland  <aidalgol@amuri.net>
 
 	* eshell/em-unix.el: Added -r option to cp

=== modified file 'lisp/progmodes/cc-mode.el'
--- lisp/progmodes/cc-mode.el	2013-05-27 13:30:21 +0000
+++ lisp/progmodes/cc-mode.el	2013-05-28 15:42:56 +0000
@@ -1059,7 +1059,7 @@
   ;; This calls the language variable c-before-font-lock-functions, if non nil.
   ;; This typically sets `syntax-table' properties.
 
-  (c-save-buffer-state ()
+  (c-save-buffer-state (case-fold-search)
     ;; When `combine-after-change-calls' is used we might get calls
     ;; with regions outside the current narrowing.  This has been
     ;; observed in Emacs 20.7.
------------------------------------------------------------
revno: 112759
committer: Aidan Gauland <aidalgol@no8wireless.co.nz>
branch nick: trunk
timestamp: Tue 2013-05-28 22:22:03 +1200
message:
  Added -r option to eshell/cp
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-28 07:47:11 +0000
+++ lisp/ChangeLog	2013-05-28 10:22:03 +0000
@@ -1,3 +1,7 @@
+2013-05-28  Aidan Gauland  <aidalgol@amuri.net>
+
+	* eshell/em-unix.el: Added -r option to cp
+
 2013-05-28  Glenn Morris  <rgm@gnu.org>
 
 	* vc/vc-arch.el (vc-exec-after): Declare.

=== modified file 'lisp/eshell/em-unix.el'
--- lisp/eshell/em-unix.el	2013-03-26 22:08:58 +0000
+++ lisp/eshell/em-unix.el	2013-05-28 10:22:03 +0000
@@ -532,8 +532,10 @@
 	 "don't change anything on disk")
      (?p "preserve" nil preserve
 	 "preserve file attributes if possible")
-     (?R "recursive" nil em-recursive
+     (?r "recursive" nil em-recursive
 	 "copy directories recursively")
+     (?R nil nil em-recursive
+	 "as for -r")
      (?v "verbose" nil em-verbose
 	 "explain what is being done")
      (nil "help" nil nil "show this usage screen")
------------------------------------------------------------
revno: 112758
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 00:47:11 -0700
message:
  Silence the rest of vc compilation
  
  * vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
  Declare.
  (vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
  
  * vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
  (grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
  (vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
  
  * vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
  (vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
  
  * vc/vc-sccs.el (vc-file-tree-walk): Declare.
  (vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
  (vc-tag-precondition, vc-rename-master): Autoload.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-28 07:01:59 +0000
+++ lisp/ChangeLog	2013-05-28 07:47:11 +0000
@@ -6,12 +6,24 @@
 	(vc-exec-after, vc-set-async-update, vc-default-dir-printer)
 	(vc-resynch-buffer, vc-dir-refresh): Declare.
 	(vc-setup-buffer, vc-switches): Autoload.
+	* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff)
+	(vc-resynch-buffer): Declare.
+	(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
 	* vc/vc-dir.el (desktop-missing-file-warning): Declare.
+	* vc/vc-git.el (vc-exec-after, vc-set-async-update)
+	(grep-read-regexp, grep-read-files, grep-expand-template)
+	(vc-dir-refresh): Declare.
+	(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
+	* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
+	(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
 	* vc/vc-mtn.el (vc-exec-after): Declare.
 	(vc-switches): Autoload.
 	* vc/vc-rcs.el (vc-expand-dirs, vc-switches)
 	(vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
 	(vc-file-tree-walk): Declare.
+	* vc/vc-sccs.el (vc-file-tree-walk): Declare.
+	(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
+	(vc-tag-precondition, vc-rename-master): Autoload.
 	* vc/vc-svn.el (vc-exec-after): Declare.
 	(vc-switches, vc-setup-buffer): Autoload.
 	* obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):

=== modified file 'lisp/vc/vc-cvs.el'
--- lisp/vc/vc-cvs.el	2013-04-24 07:52:00 +0000
+++ lisp/vc/vc-cvs.el	2013-05-28 07:47:11 +0000
@@ -280,6 +280,8 @@
 ;;; State-changing functions
 ;;;
 
+(autoload 'vc-switches "vc")
+
 (defun vc-cvs-register (files &optional _rev comment)
   "Register FILES into the CVS version-control system.
 COMMENT can be used to provide an initial description of FILES.
@@ -415,6 +417,8 @@
 (defun vc-cvs-delete-file (file)
   (vc-cvs-command nil 0 file "remove" "-f"))
 
+(autoload 'vc-default-revert "vc")
+
 (defun vc-cvs-revert (file &optional contents-done)
   "Revert FILE to the working revision on which it was based."
   (vc-default-revert 'CVS file contents-done)
@@ -501,6 +505,8 @@
 ;;;
 
 (declare-function vc-rcs-print-log-cleanup "vc-rcs" ())
+;; Follows vc-cvs-command, which uses vc-do-command from vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
 
 (defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit)
   "Print commit log associated with FILES into specified BUFFER.
@@ -519,6 +525,9 @@
   "Get comment history of a file."
   (vc-call-backend 'RCS 'comment-history file))
 
+(autoload 'vc-version-backup-file "vc")
+(declare-function vc-coding-system-for-diff "vc" (file))
+
 (defun vc-cvs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using CVS between two revisions of FILE."
   (let* (process-file-side-effects
@@ -665,6 +674,10 @@
   (vc-cvs-command nil 0 dir "tag" "-c" (if branchp "-b") name)
   (when branchp (vc-cvs-command nil 0 dir "update" "-r" name)))
 
+;; Follows vc-cvs-command, which uses vc-do-command from vc-dispatcher.
+(declare-function vc-resynch-buffer "vc-dispatcher"
+                  (file &optional keep noquery reset-vc-info))
+
 (defun vc-cvs-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 `cvs update'.

=== modified file 'lisp/vc/vc-git.el'
--- lisp/vc/vc-git.el	2013-05-27 23:11:21 +0000
+++ lisp/vc/vc-git.el	2013-05-28 07:47:11 +0000
@@ -443,6 +443,12 @@
     (when next-stage
       (vc-git-dir-status-goto-stage next-stage files update-function))))
 
+;; Follows vc-git-command (or vc-do-async-command), which uses vc-do-command
+;; from vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+;; Follows vc-exec-after.
+(declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
+
 (defun vc-git-dir-status-goto-stage (stage files update-function)
   (erase-buffer)
   (pcase stage
@@ -731,6 +737,8 @@
 
 ;;; HISTORY FUNCTIONS
 
+(autoload 'vc-setup-buffer "vc-dispatcher")
+
 (defun vc-git-print-log (files buffer &optional shortlog start-revision limit)
   "Print commit log associated with FILES into specified BUFFER.
 If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'.
@@ -857,6 +865,8 @@
       (indent-region (point-min) (point-max) 2)
       (buffer-string))))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-git-diff (files &optional rev1 rev2 buffer)
   "Get a difference report using Git between two revisions of FILES."
   (let (process-file-side-effects)
@@ -1010,6 +1020,12 @@
   (or (vc-file-getprop file 'git-root)
       (vc-file-setprop file 'git-root (vc-find-root file ".git"))))
 
+;; grep-compute-defaults autoloads grep.
+(declare-function grep-read-regexp "grep" ())
+(declare-function grep-read-files "grep" (regexp))
+(declare-function grep-expand-template "grep"
+                 (template &optional regexp files dir excl))
+
 ;; Derived from `lgrep'.
 (defun vc-git-grep (regexp &optional files dir)
   "Run git grep, searching for REGEXP in FILES in directory DIR.
@@ -1065,6 +1081,10 @@
 	(if (eq next-error-last-buffer (current-buffer))
 	    (setq default-directory dir))))))
 
+;; Everywhere but here, follows vc-git-command, which uses vc-do-command
+;; from vc-dispatcher.
+(autoload 'vc-resynch-buffer "vc-dispatcher")
+
 (defun vc-git-stash (name)
   "Create a stash."
   (interactive "sStash name: ")
@@ -1122,6 +1142,9 @@
 	(match-string 1)
       (error "Cannot find stash at point"))))
 
+;; vc-git-stash-delete-at-point must be called from a vc-dir buffer.
+(declare-function vc-dir-refresh "vc-dir" ())
+
 (defun vc-git-stash-delete-at-point ()
   (interactive)
   (let ((stash (vc-git-stash-get-at-point (point))))

=== modified file 'lisp/vc/vc-hg.el'
--- lisp/vc/vc-hg.el	2013-04-24 07:59:29 +0000
+++ lisp/vc/vc-hg.el	2013-05-28 07:47:11 +0000
@@ -245,6 +245,8 @@
                  (repeat :tag "Argument List" :value ("") string))
   :group 'vc-hg)
 
+(autoload 'vc-setup-buffer "vc-dispatcher")
+
 (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
   "Print commit log associated with FILES into specified BUFFER.
 If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'.
@@ -306,6 +308,8 @@
 	    ("^tag: +\\([^ ]+\\)$" (1 'highlight))
 	    ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-hg-diff (files &optional oldvers newvers buffer)
   "Get a difference report using hg between two revisions of FILES."
   (let* ((firstfile (car files))
@@ -591,6 +595,12 @@
         (forward-line))
       (funcall update-function result)))
 
+;; Follows vc-hg-command (or vc-do-async-command), which uses vc-do-command
+;; from vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+;; Follows vc-exec-after.
+(declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
+
 (defun vc-hg-dir-status (dir update-function)
   (vc-hg-command (current-buffer) 'async dir "status" "-C")
   (vc-exec-after
@@ -651,6 +661,8 @@
   ;;       modified files
   "Value of `compilation-error-regexp-alist' in *vc-hg* buffers.")
 
+(autoload 'vc-do-async-command "vc-dispatcher")
+
 (defun vc-hg-pull (prompt)
   "Issue a Mercurial pull command.
 If called interactively with a set of marked Log View buffers,

=== modified file 'lisp/vc/vc-sccs.el'
--- lisp/vc/vc-sccs.el	2013-04-24 07:52:00 +0000
+++ lisp/vc/vc-sccs.el	2013-05-28 07:47:11 +0000
@@ -155,6 +155,8 @@
             (vc-sccs-state file))))
     (vc-sccs-state file)))
 
+(autoload 'vc-expand-dirs "vc")
+
 (defun vc-sccs-dir-status (dir update-function)
   ;; FIXME: this function should be rewritten, using `vc-expand-dirs'
   ;; is not TRTD because it returns files from multiple backends.
@@ -216,6 +218,8 @@
   ;; SCCS is totally file-oriented, so all we have to do is make the directory
   (make-directory "SCCS"))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-sccs-register (files &optional rev comment)
   "Register FILES into the SCCS version-control system.
 REV is the optional revision number for the file.  COMMENT can be used
@@ -356,6 +360,9 @@
   (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files))
   (when limit 'limit-unsupported))
 
+(autoload 'vc-setup-buffer "vc-dispatcher")
+(autoload 'vc-delistify "vc-dispatcher")
+
 ;; FIXME use sccsdiff if present?
 (defun vc-sccs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SCCS between two filesets."
@@ -432,6 +439,9 @@
 ;;; our own set of name-to-revision mappings.
 ;;;
 
+(autoload 'vc-tag-precondition "vc")
+(declare-function vc-file-tree-walk "vc" (dirname func &rest args))
+
 (defun vc-sccs-create-tag (dir name branchp)
   (when branchp
     (error "SCCS backend does not support module branches"))
@@ -460,6 +470,8 @@
     (goto-char (point-min))
     (re-search-forward  "%[A-Z]%" nil t)))
 
+(autoload 'vc-rename-master "vc")
+
 (defun vc-sccs-rename-file (old new)
   ;; Move the master file (using vc-rcs-master-templates).
   (vc-rename-master (vc-name old) new vc-sccs-master-templates)
------------------------------------------------------------
revno: 112757
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 00:03:00 -0700
message:
  Commit file missing from previous change
  
  * obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert): Autoload.
  (vc-resynch-buffer): Declare.
diff:
=== modified file 'lisp/obsolete/vc-mcvs.el'
--- lisp/obsolete/vc-mcvs.el	2013-01-01 09:11:05 +0000
+++ lisp/obsolete/vc-mcvs.el	2013-05-28 07:03:00 +0000
@@ -189,6 +189,8 @@
 ;;;
 ;;; State-changing functions
 ;;;
+(autoload 'vc-checkout "vc")
+(autoload 'vc-switches "vc")
 
 (defun vc-mcvs-register (files &optional rev comment)
   "Register FILES into the Meta-CVS version-control system.
@@ -345,6 +347,8 @@
 (defun vc-mcvs-rename-file (old new)
   (vc-mcvs-command nil 0 new "move" (file-relative-name old)))
 
+(autoload 'vc-default-revert "vc")
+
 (defun vc-mcvs-revert (file &optional contents-done)
   "Revert FILE to the working revision it was based on."
   (vc-default-revert 'MCVS file contents-done)
@@ -478,6 +482,10 @@
     (vc-mcvs-command nil 0 dir "branch" name)
     (vc-mcvs-command nil 0 dir "switch" name)))
 
+;; vc-mcvs-command calls the autoloaded vc-do-command from vc-dispatcher.
+(declare-function vc-resynch-buffer "vc-dispatcher"
+		  (file &optional keep noquery reset-vc-info))
+
 (defun vc-mcvs-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 `cvs update'.
------------------------------------------------------------
revno: 112756
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Tue 2013-05-28 00:01:59 -0700
message:
  Silence some vc compilation warnings
  
  * lisp/vc/vc-arch.el (vc-exec-after): Declare.
  (vc-switches): Autoload.
  
  * lisp/vc/vc-bzr.el: No need to require vc when compiling.
  (vc-exec-after, vc-set-async-update, vc-default-dir-printer)
  (vc-resynch-buffer, vc-dir-refresh): Declare.
  (vc-setup-buffer, vc-switches): Autoload.
  
  * lisp/vc/vc-dir.el (desktop-missing-file-warning): Declare.
  
  * lisp/vc/vc-mtn.el (vc-exec-after): Declare.
  (vc-switches): Autoload.
  
  * lisp/vc/vc-rcs.el (vc-expand-dirs, vc-switches)
  (vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
  (vc-file-tree-walk): Declare.
  
  * lisp/vc/vc-svn.el (vc-exec-after): Declare.
  (vc-switches, vc-setup-buffer): Autoload.
  
  * lisp/obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):
  Autoload.
  (vc-resynch-buffer): Declare.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-28 06:56:55 +0000
+++ lisp/ChangeLog	2013-05-28 07:01:59 +0000
@@ -1,5 +1,23 @@
 2013-05-28  Glenn Morris  <rgm@gnu.org>
 
+	* vc/vc-arch.el (vc-exec-after): Declare.
+	(vc-switches): Autoload.
+	* vc/vc-bzr.el: No need to require vc when compiling.
+	(vc-exec-after, vc-set-async-update, vc-default-dir-printer)
+	(vc-resynch-buffer, vc-dir-refresh): Declare.
+	(vc-setup-buffer, vc-switches): Autoload.
+	* vc/vc-dir.el (desktop-missing-file-warning): Declare.
+	* vc/vc-mtn.el (vc-exec-after): Declare.
+	(vc-switches): Autoload.
+	* vc/vc-rcs.el (vc-expand-dirs, vc-switches)
+	(vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
+	(vc-file-tree-walk): Declare.
+	* vc/vc-svn.el (vc-exec-after): Declare.
+	(vc-switches, vc-setup-buffer): Autoload.
+	* obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):
+	Autoload.
+	(vc-resynch-buffer): Declare.
+
 	* obsolete/fast-lock.el (byte-compile-warnings):
 	Don't warn about obsolete features in this obsolete file.
 

=== modified file 'lisp/vc/vc-arch.el'
--- lisp/vc/vc-arch.el	2013-02-01 17:19:24 +0000
+++ lisp/vc/vc-arch.el	2013-05-28 07:01:59 +0000
@@ -311,6 +311,9 @@
 		    'up-to-date
 		  'edited)))))))))
 
+;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+
 (defun vc-arch-dir-status (dir callback)
   "Run 'tla inventory' for DIR and pass results to CALLBACK.
 CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
@@ -432,6 +435,8 @@
 	(message "There are unresolved conflicts in %s"
 		 (file-name-nondirectory rej))))))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-arch-checkin (files rev comment)
   (if rev (error "Committing to a specific revision is unsupported"))
   ;; FIXME: This implementation probably only works for singleton filesets

=== modified file 'lisp/vc/vc-bzr.el'
--- lisp/vc/vc-bzr.el	2013-04-25 00:53:18 +0000
+++ lisp/vc/vc-bzr.el	2013-05-28 07:01:59 +0000
@@ -47,8 +47,7 @@
 
 (eval-when-compile
   (require 'cl-lib)
-  (require 'vc)  ;; for vc-exec-after
-  (require 'vc-dir))
+  (require 'vc-dir))                    ; vc-dir-at-event
 
 ;; Clear up the cache to force vc-call to check again and discover
 ;; new functions when we reload this file.
@@ -320,6 +319,12 @@
     ("^Using saved parent location: \\(.+\\)" 1 nil nil 0))
   "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.")
 
+;; Follows vc-bzr-(async-)command, which uses vc-do-(async-)command
+;; from vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+;; Follows vc-exec-after.
+(declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
+
 (defun vc-bzr-pull (prompt)
   "Pull changes into the current Bzr branch.
 Normally, this runs \"bzr pull\".  However, if the branch is a
@@ -693,6 +698,8 @@
 		    (2 'change-log-email))
 		   ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
 
+(autoload 'vc-setup-buffer "vc-dispatcher")
+
 (defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit)
   "Print commit log associated with FILES into specified BUFFER.
 If SHORTLOG is non-nil, use --line format.
@@ -778,6 +785,8 @@
 	(goto-char (point-min)))
       found)))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
   "VC bzr backend for diff."
   (let* ((switches (vc-switches 'bzr 'diff))
@@ -898,6 +907,8 @@
             (:conc-name vc-bzr-extra-fileinfo->))
   extra-name)         ;; original name for rename targets, new name for
 
+(declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
+
 (defun vc-bzr-dir-printer (info)
   "Pretty-printer for the vc-dir-fileinfo structure."
   (let ((extra (vc-dir-fileinfo->extra info)))
@@ -1110,6 +1121,10 @@
 		     'help-echo shelve-help-echo
 		     'face 'font-lock-variable-name-face))))))
 
+;; Follows vc-bzr-command, which uses vc-do-command from vc-dispatcher.
+(declare-function vc-resynch-buffer "vc-dispatcher"
+                  (file &optional keep noquery reset-vc-info))
+
 (defun vc-bzr-shelve (name)
   "Create a shelve."
   (interactive "sShelf name: ")
@@ -1169,6 +1184,9 @@
 	(match-string 1)
       (error "Cannot find shelf at point"))))
 
+;; vc-bzr-shelve-delete-at-point must be called from a vc-dir buffer.
+(declare-function vc-dir-refresh "vc-dir" ())
+
 (defun vc-bzr-shelve-delete-at-point ()
   (interactive)
   (let ((shelve (vc-bzr-shelve-get-at-point (point))))

=== modified file 'lisp/vc/vc-dir.el'
--- lisp/vc/vc-dir.el	2013-05-02 17:47:39 +0000
+++ lisp/vc/vc-dir.el	2013-05-28 07:01:59 +0000
@@ -1299,6 +1299,8 @@
   "Auxiliary information to be saved in desktop file."
   (cons (desktop-file-name default-directory dirname) vc-dir-backend))
 
+(defvar desktop-missing-file-warning)
+
 (defun vc-dir-restore-desktop-buffer (_filename _buffername misc-data)
   "Restore a `vc-dir' buffer specified in a desktop file."
   (let ((dir (car misc-data))

=== modified file 'lisp/vc/vc-mtn.el'
--- lisp/vc/vc-mtn.el	2013-04-24 07:52:00 +0000
+++ lisp/vc/vc-mtn.el	2013-05-28 07:01:59 +0000
@@ -123,6 +123,9 @@
 	     ((match-end 2) (push (list (match-string 3) 'added) result))))
     (funcall update-function result)))
 
+;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+
 (defun vc-mtn-dir-status (dir update-function)
   (vc-mtn-command (current-buffer) 'async dir "status")
   (vc-exec-after
@@ -233,6 +236,8 @@
 ;; (defun vc-mtn-show-log-entry (revision)
 ;;   )
 
+(autoload 'vc-switches "vc")
+
 (defun vc-mtn-diff (files &optional rev1 rev2 buffer)
   "Get a difference report using monotone between two revisions of FILES."
   (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff"

=== modified file 'lisp/vc/vc-rcs.el'
--- lisp/vc/vc-rcs.el	2013-04-24 07:52:00 +0000
+++ lisp/vc/vc-rcs.el	2013-05-28 07:01:59 +0000
@@ -200,6 +200,8 @@
                    (vc-rcs-state file))))
         (vc-rcs-state file)))))
 
+(autoload 'vc-expand-dirs "vc")
+
 (defun vc-rcs-dir-status (dir update-function)
   ;; FIXME: this function should be rewritten or `vc-expand-dirs'
   ;; should be changed to take a backend parameter.  Using
@@ -270,6 +272,8 @@
   ;; RCS is totally file-oriented, so all we have to do is make the directory.
   (make-directory "RCS"))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-rcs-register (files &optional rev comment)
   "Register FILES into the RCS version-control system.
 REV is the optional revision number for the files.  COMMENT can be used
@@ -821,6 +825,9 @@
 ;;; Tag system
 ;;;
 
+(autoload 'vc-tag-precondition "vc")
+(declare-function vc-file-tree-walk "vc" (dirname func &rest args))
+
 (defun vc-rcs-create-tag (dir name branchp)
   (when branchp
     (error "RCS backend does not support module branches"))
@@ -892,6 +899,8 @@
           (t "rcs2log")))
   "Path to the `rcs2log' program (normally in `exec-directory').")
 
+(autoload 'vc-buffer-sync "vc-dispatcher")
+
 (defun vc-rcs-update-changelog (files)
   "Default implementation of update-changelog.
 Uses `rcs2log' which only works for RCS and CVS."
@@ -958,6 +967,8 @@
             nil t)
       (replace-match "$\\1$"))))
 
+(autoload 'vc-rename-master "vc")
+
 (defun vc-rcs-rename-file (old new)
   ;; Just move the master file (using vc-rcs-master-templates).
   (vc-rename-master (vc-name old) new vc-rcs-master-templates))

=== modified file 'lisp/vc/vc-svn.el'
--- lisp/vc/vc-svn.el	2013-04-24 07:59:29 +0000
+++ lisp/vc/vc-svn.el	2013-05-28 07:01:59 +0000
@@ -215,6 +215,9 @@
          (setq result (cons (list filename state) result)))))
     (funcall callback result)))
 
+;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher.
+(declare-function vc-exec-after "vc-dispatcher" (code))
+
 (defun vc-svn-dir-status (dir callback)
   "Run 'svn status' for DIR and update BUFFER via CALLBACK.
 CALLBACK is called as (CALLBACK RESULT BUFFER), where
@@ -293,6 +296,8 @@
   (vc-svn-command "*vc*" 0 "." "checkout"
                   (concat "file://" default-directory "SVN")))
 
+(autoload 'vc-switches "vc")
+
 (defun vc-svn-register (files &optional rev comment)
   "Register FILES into the SVN version-control system.
 The COMMENT argument is ignored  This does an add but not a commit.
@@ -493,6 +498,8 @@
   (require 'add-log)
   (set (make-local-variable 'log-view-per-file-logs) nil))
 
+(autoload 'vc-setup-buffer "vc-dispatcher")
+
 (defun vc-svn-print-log (files buffer &optional shortlog start-revision limit)
   "Print commit log associated with FILES into specified BUFFER.
 SHORTLOG is ignored.
------------------------------------------------------------
revno: 112755
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Mon 2013-05-27 23:56:55 -0700
message:
  * obsolete/fast-lock.el (byte-compile-warnings):
  Don't warn about obsolete features in this obsolete file.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-05-28 06:55:48 +0000
+++ lisp/ChangeLog	2013-05-28 06:56:55 +0000
@@ -1,5 +1,8 @@
 2013-05-28  Glenn Morris  <rgm@gnu.org>
 
+	* obsolete/fast-lock.el (byte-compile-warnings):
+	Don't warn about obsolete features in this obsolete file.
+
 	* progmodes/cc-vars.el (c-macro-names-with-semicolon):
 	Move definition before use.
 

=== modified file 'lisp/obsolete/fast-lock.el'
--- lisp/obsolete/fast-lock.el	2013-01-01 09:11:05 +0000
+++ lisp/obsolete/fast-lock.el	2013-05-28 06:56:55 +0000
@@ -855,3 +855,7 @@
 (provide 'fast-lock)
 
 ;;; fast-lock.el ends here
+
+;; Local Variables:
+;; byte-compile-warnings: (not obsolete)
+;; End: