# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1258474256 -32400
# Node ID c1784fd59d7de389661f57bbef97ce6145e399ed
# Parent  5dc1b4681e333e3d1a7ae6a26a1986026a547b17
Fix syntax of some uses of condition-case and with-trapping-errors.

diff -r 5dc1b4681e33 -r c1784fd59d7d lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Nov 18 01:06:53 2009 +0900
+++ b/lisp/ChangeLog	Wed Nov 18 01:10:56 2009 +0900
@@ -168,6 +168,17 @@
 	* glyphs.el (make-image-specifier): Remove ancient comment about
 	lack of support for animated GIFs.
 
+2009-08-16  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* gutter-items.el (progress-feedback-dispatch-non-command-events):
+	Correct syntax of `condition-case'.
+
+2009-06-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* font-lock.el (font-lock-pre-idle-hook):
+	* etags.el (find-tag-default):
+	Correct :operation arguments in `with-trapping-errors'.
+
 2009-10-03  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* cl-macs.el (delete-duplicates): 
diff -r 5dc1b4681e33 -r c1784fd59d7d lisp/etags.el
--- a/lisp/etags.el	Wed Nov 18 01:06:53 2009 +0900
+++ b/lisp/etags.el	Wed Nov 18 01:10:56 2009 +0900
@@ -633,7 +633,7 @@
 (defun find-tag-default ()
   (or (and (not (memq find-tag-default-hook '(nil find-tag-default)))
 	   (with-trapping-errors 
-	     :function 'find-tag-default-hook
+	     :operation 'find-tag-default-hook
 	     :error-form nil
 	     (funcall find-tag-default-hook)))
       (symbol-near-point)))
diff -r 5dc1b4681e33 -r c1784fd59d7d lisp/font-lock.el
--- a/lisp/font-lock.el	Wed Nov 18 01:06:53 2009 +0900
+++ b/lisp/font-lock.el	Wed Nov 18 01:10:56 2009 +0900
@@ -1442,7 +1442,7 @@
 (defvar font-lock-range-table (make-range-table))
 
 (defun font-lock-pre-idle-hook ()
-  (with-trapping-errors 'font-lock-pre-idle-hook
+  (with-trapping-errors :operation 'font-lock-pre-idle-hook
     (if (> (hash-table-count font-lock-pending-buffer-table) 0)
 	(font-lock-fontify-pending-extents))))
 
diff -r 5dc1b4681e33 -r c1784fd59d7d lisp/gutter-items.el
--- a/lisp/gutter-items.el	Wed Nov 18 01:06:53 2009 +0900
+++ b/lisp/gutter-items.el	Wed Nov 18 01:10:56 2009 +0900
@@ -540,11 +540,10 @@
 
 (defun progress-feedback-dispatch-non-command-events ()
   ;; don't allow errors to hose things
-  (condition-case t 
-      ;; (sit-for 0) is too agressive and cause more display than we
-      ;; want.
+  (condition-case nil 
+      ;; (sit-for 0) causes more redisplay than we want.
       (dispatch-non-command-events)
-    nil))
+    (t nil)))
 
 (defun append-progress-feedback (label message &optional value frame)
   (or frame (setq frame (selected-frame)))