Mercurial > emacs

--- a/lisp/ChangeLog	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/ChangeLog	Wed Mar 24 06:31:35 2010 +0000
@@ -1,3 +1,19 @@
+2010-03-24  Glenn Morris  <rgm@gnu.org>
+
+	* vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
+
+	* vc.el, vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
+
+	* vc-dispatcher.el (vc-start-logentry): Doc fix.
+	(log-view-process-buffer, log-edit-extra-flags): Declare.
+
+	* log-edit.el (log-edit-before-checkin-process): Doc fix.
+
+	* cedet/semantic/bovine/c.el (semantic-c-describe-environment):
+	Consistently check ede-object is bound throughout.
+
+	* cedet/ede/project-am.el (ede-shell-run-something): Declare.
+
 2010-03-23  Sam Steingold  <sds@gnu.org>

 	Fix bug#5620: recalculate all markers on compilation buffer
--- a/lisp/cedet/ede/project-am.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/cedet/ede/project-am.el	Wed Mar 24 06:31:35 2010 +0000
@@ -402,6 +402,8 @@
 	  (funcall project-am-debug-target-function cmd))
       (kill-buffer tb))))

+(declare-function ede-shell-run-something "ede/shell")
+
 (defmethod project-run-target ((obj project-am-objectcode))
   "Run the current project target in comint buffer."
   (let ((tb (get-buffer-create " *padt*"))
--- a/lisp/cedet/semantic/bovine/c.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/cedet/semantic/bovine/c.el	Wed Mar 24 06:31:35 2010 +0000
@@ -1761,8 +1761,9 @@

       (when (arrayp semantic-lex-spp-project-macro-symbol-obarray)
 	(princ "\n  Project symbol map:\n")
-	(princ "      Your project symbol map is derived from the EDE object:\n      ")
-	(princ (object-print ede-object))
+	(when (and (boundp 'ede-object) ede-object)
+	  (princ "      Your project symbol map is derived from the EDE object:\n      ")
+	  (princ (object-print ede-object)))
 	(princ "\n\n")
 	(let ((macros nil))
 	  (mapatoms
--- a/lisp/gnus/ChangeLog	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/gnus/ChangeLog	Wed Mar 24 06:31:35 2010 +0000
@@ -1,3 +1,8 @@
+2010-03-24  Glenn Morris  <rgm@gnu.org>
+
+	* mail-source.el (gnus-message): Declare.
+	(mail-source-delete-old-incoming): Require gnus-util.
+
 2010-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>

 	* gnus-art.el (canlock-verify): Autoload it for Emacs 21.
--- a/lisp/gnus/mail-source.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/gnus/mail-source.el	Wed Mar 24 06:31:35 2010 +0000
@@ -1,7 +1,7 @@
 ;;; mail-source.el --- functions for fetching mail

-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.

 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -574,10 +574,13 @@
 		      (error "Cannot get new mail"))
 		    0)))))))))

+(declare-function gnus-message "gnus-util" (level &rest args))
+
 (defun mail-source-delete-old-incoming (&optional age confirm)
   "Remove incoming files older than AGE days.
 If CONFIRM is non-nil, ask for confirmation before removing a file."
   (interactive "P")
+  (require 'gnus-util)
   (let* ((high2days (/ 65536.0 60 60 24));; convert high bits to days
 	 (low2days  (/ 1.0 65536.0))     ;; convert low bits to days
 	 (diff (if (natnump age) age 30));; fallback, if no valid AGE given
--- a/lisp/log-edit.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/log-edit.el	Wed Mar 24 06:31:35 2010 +0000
@@ -191,22 +191,20 @@
 (defvar log-edit-extra-flags nil
   "List of extra flags to pass to the check in command.")
 (defvar log-edit-before-checkin-process nil
-  "Alist that contains instructions for processing the commit message before check in.
-
+  "Alist with instructions for processing the commit message before check in.
 The format is: (REGEXP . INSTRUCTIONS).
+All lines matching REGEXP are removed.  For example:

-All lines matching REGEXP are removed.
+\(\"^#.*\" . nil)

-For example:
-
-(\"^#.*\" . nil)
 means: just remove all lines starting with #.  This can be used
 to insert lines in the commit buffer that contain, for example, the
 list of files to be committed.

-(\"Author: \\(.*\\)\" . (list \"--author\" (match-string 1)))
-means: append (list \"--author\" (match-string 1)) to
-`log-edit-extra-flags'.")
+\(\"Author: \\\\(.*\\\\)\" . (list \"--author\" (match-string 1)))
+
+means: append (list \"--author\" (match-string 1)) to `log-edit-extra-flags'.")
+
 (defvar log-edit-parent-buffer nil)

 ;;; Originally taken from VC-Log mode
--- a/lisp/vc-bzr.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/vc-bzr.el	Wed Mar 24 06:31:35 2010 +0000
@@ -545,6 +545,7 @@
 	(goto-char (point-min)))
       found)))

+(declare-function log-edit-mode "log-edit" ())
 (defvar log-edit-extra-flags)
 (defvar log-edit-before-checkin-process)
--- a/lisp/vc-dispatcher.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/vc-dispatcher.el	Wed Mar 24 06:31:35 2010 +0000
@@ -539,8 +539,9 @@
 INITIAL-CONTENTS is nil, do action immediately as if the user had
 entered COMMENT.  If COMMENT is t, also do action immediately with an
 empty comment.  Remember the file's buffer in `vc-parent-buffer'
-\(current one if no file).  AFTER-HOOK specifies the local value
-for `vc-log-after-operation-hook'."
+\(current one if no file).  Puts the log-entry buffer in major-mode
+MODE, defaulting to `log-edit-mode' if MODE is nil.
+AFTER-HOOK specifies the local value for `vc-log-after-operation-hook'."
   (let ((parent
          (if (vc-dispatcher-browsing)
              ;; If we are called from a directory browser, the parent buffer is
@@ -569,6 +570,9 @@
       (vc-finish-logentry (eq comment t)))))

 (declare-function vc-dir-move-to-goal-column "vc-dir" ())
+;; vc-finish-logentry is called from a log-edit buffer (see above).
+(declare-function log-view-process-buffer "log-edit" ())
+(defvar log-edit-extra-flags)

 (defun vc-finish-logentry (&optional nocomment)
   "Complete the operation implied by the current log entry.
--- a/lisp/vc-hg.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/vc-hg.el	Wed Mar 24 06:31:35 2010 +0000
@@ -279,6 +279,7 @@
           ("^date: \\(.+\\)" (1 'change-log-date))
             ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))

+(declare-function log-edit-mode "log-edit" ())
 (defvar log-edit-extra-flags)
 (defvar log-edit-before-checkin-process)

@@ -286,7 +287,7 @@
   "Mode for editing Hg commit logs.
 If a line like:
 Author: NAME
-is present in the log, it is removed, and
+is present in the log, it is removed, and
 --author NAME
 is passed to the hg commit command."
   (set (make-local-variable 'log-edit-extra-flags) nil)
--- a/lisp/vc.el	Tue Mar 23 21:50:49 2010 +0000
+++ b/lisp/vc.el	Wed Mar 24 06:31:35 2010 +0000
@@ -1744,17 +1744,18 @@

 (defun vc-modify-change-comment (files rev oldcomment)
   "Edit the comment associated with the given files and revision."
-  (vc-start-logentry
-   files rev oldcomment t
-   "Enter a replacement change comment."
-   "*VC-log*"
-   (lambda (files rev comment ignored)
-     (vc-call-backend
-      ;; Less of a kluge than it looks like; log-view mode only passes
-      ;; this function a singleton list.  Arguments left in this form in
-      ;; case the more general operation ever becomes meaningful.
-      (vc-responsible-backend (car files))
-      'modify-change-comment files rev comment))))
+  ;; Less of a kluge than it looks like; log-view mode only passes
+  ;; this function a singleton list.  Arguments left in this form in
+  ;; case the more general operation ever becomes meaningful.
+  (let ((backend (vc-responsible-backend (car files))))
+    (vc-start-logentry
+     files rev oldcomment t
+     "Enter a replacement change comment."
+     "*VC-log*"
+     (lambda () (vc-call-backend backend 'log-edit-mode))
+     (lambda (files rev comment ignored)
+       (vc-call-backend backend
+                        'modify-change-comment files rev comment)))))

 ;;;###autoload
 (defun vc-merge ()
@@ -2433,6 +2434,8 @@

 (defalias 'vc-default-check-headers 'ignore)

+(declare-function log-edit-mode "log-edit" ())
+
 (defun vc-default-log-edit-mode (backend) (log-edit-mode))

 (defun vc-default-log-view-mode (backend) (log-view-mode))