[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v
From: |
Carsten Dominik |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v |
Date: |
Thu, 25 Oct 2007 14:24:44 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Carsten Dominik <cdominik> 07/10/25 14:24:43
Index: org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/org.el,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- org.el 25 Oct 2007 13:57:28 -0000 1.163
+++ org.el 25 Oct 2007 14:24:43 -0000 1.164
@@ -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
+
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v, John Wiegley, 2007/10/10
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v, Glenn Morris, 2007/10/12
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v, John Wiegley, 2007/10/22
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v, Carsten Dominik, 2007/10/24
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v, Carsten Dominik, 2007/10/25
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v, Carsten Dominik, 2007/10/25
- [Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v,
Carsten Dominik <=