Fix my previous breakages; improve ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5e0ebd251266ca26a0c4012e5cafb1ea44562ba..236419d04f6c6e63d34aee4b926a39fff2ed033a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,49 +1,35 @@
 2007-12-06  D. Goel  <deego3@gmail.com>
 
-       * textmodes/reftex.el (reftex-TeX-master-file): Ditto.
+       * vc.el: Fix breakage.
+       * ibuffer.el (ibuffer-current-buffer): Ditto.
+       * gnus/gnus-start.el (gnus-load): Ditto.
 
+       * allout.el (allout-write-file-hook-handler): Fix buggy call(s) to `error'.
+       * textmodes/reftex.el (reftex-TeX-master-file): Ditto.
        * textmodes/org.el (org-paste-subtree): Ditto.
-
        * textmodes/ispell.el (ispell-process-line): Ditto.
-
        * progmodes/vhdl-mode.el (vhdl-template-modify): Ditto.
-
        * progmodes/idlw-shell.el (idlwave-shell-send-command): Ditto.
        (idlwave-shell-display-line): Ditto.
-
        * progmodes/ada-xref.el (ada-find-file): Ditto.
        (ada-get-all-references): Ditto.
        (ada-xref-find-in-modified-ali): Ditto.
        (ada-find-in-src-path): Ditto.
-
        * net/trampver.el (x): Ditto.
-
        * mail/uce.el (uce-reply-to-uce): Ditto.
-
        * mail/rmailout.el (rmail-output): Ditto.
-
        * mail/feedmail.el (feedmail-dump-message-to-queue): Ditto.
-
        * whitespace.el (whitespace-write-file-hook): Ditto.
-
        * wdired.el (wdired-check-kill-buffer): Ditto.
-
        * vc.el (vc-update): Ditto.
-
        * vc-mcvs.el (vc-mcvs-checkin): Ditto.
-
        * vc-cvs.el (vc-cvs-checkin): Ditto.
-
        * man.el (Man-bgproc-sentinel): Ditto.
        (Man-goto-see-also-section): Ditto.
-
        * ibuffer.el (ibuffer-current-buffer): Ditto.
-
        * dired.el (dired-move-to-end-of-filename): Ditto.
-
        * bindings.el (complete-symbol): Ditto.
 
-       * allout.el (allout-write-file-hook-handler): Fix buggy call(s) to `error'.
 
 2007-12-06  D. Goel  <deego3@gmail.com>
 

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index ca906d2d258f099dd7de581c5ccad64d81ff1b54..0b8a9cea67ddb75b00945c71e85ecad9d3fd1386 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2392,8 +2392,8 @@ If FORCE is non-nil, the .newsrc file is read."
            (eval form))
        (error
         (unless (eq (car type) 'end-of-file)
-          (let ((error "Error in %s line %d" file
-                               (count-lines (point-min (point)))))
+          (let ((error (format "Error in %s line %d" file
+                               (count-lines (point-min (point))))))
             (ding)
             (unless (gnus-yes-or-no-p (concat error "; continue? "))
               (error "%s" error)))))))))

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 7ee2c973cfe4d673ee5acc8a9a0dcd57b69dbecc..aa436a969715cdc8fdf5105cace0f0bfca830ffd 100644 (file)
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1392,7 +1392,7 @@ If point is on a group name, this function operates on that group."
     (when must-be-live
       (if (bufferp buf)
          (unless (buffer-live-p buf)
-           (error "%s" (substitute-command-keys "Buffer %s has been killed; use `\\[ibuffer-update]' to update") buf))
+           (error "Buffer %s has been killed; %s" buf (substitute-command-keys "use `\\[ibuffer-update]' to update")))
        (error "No buffer on this line")))
     buf))
 

diff --git a/lisp/vc.el b/lisp/vc.el
index b54373a4e22cf62a124b16673934a663ce3c29ea..6fd6e25bd888500a3148cf81162f5dc26a6c8a7b 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2622,10 +2622,10 @@ changes from the current branch are merged into the working file."
              (error "%s"
               (substitute-command-keys
                "File is locked--type \\[vc-revert] to discard changes"))
-           (error "%s"
+           (error "Unexpected file state (%s) -- type %s"
+            (vc-state file)
             (substitute-command-keys
-             "Unexpected file state (%s)--type \\[vc-next-action] to correct")
-            (vc-state file)))
+             "\\[vc-next-action] to correct"))
        (if (not (vc-find-backend-function (vc-backend file) 'merge-news))
            (error "Sorry, merging news is not implemented for %s"
                   (vc-backend file))