# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1193322283 0
# Node ID a6a4495703c8de4b7264b67c5020961791ba18b8
# Parent  21497f1741ec9ed6766925b536b17f49bc02030b
	(org-no-warnings): New macro.
	(org-columns-eval): Use `org-no-warnings'.

diff -r 21497f1741ec -r a6a4495703c8 lisp/textmodes/org.el
--- a/lisp/textmodes/org.el	Thu Oct 25 14:21:45 2007 +0000
+++ b/lisp/textmodes/org.el	Thu Oct 25 14:24:43 2007 +0000
@@ -15611,14 +15611,15 @@
 	    org-columns-top-level-marker))
      key1 nval)))
 
+(defmacro org-no-warnings (&rest body)
+  (cons (if (fboundp 'with-no-warnings) 'with-no-warnings 'progn) body))
+
 (defun org-columns-eval (form)
   (let (hidep)
     (save-excursion
       (beginning-of-line 1)
       ;; `next-line' is needed here, because it skips invisible line.
-      ;; FIXME: RMS says this should be wrapped into `with-no-warnings'
-      ;; but I don't know how to do this and keep the code XEmacs compatible.
-      (condition-case nil (next-line 1) (error nil))
+     (condition-case nil (org-no-warnings (next-line 1)) (error nil))
       (setq hidep (org-on-heading-p 1)))
     (eval form)
     (and hidep (hide-entry))))
@@ -26486,3 +26487,4 @@
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
 
+