[PATCH] XEmacs compatibility (was: Zero Warnings against Emacs-24)

[Achim Gratz <Stromeko@nexgo.de>]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

Martyn Jago writes:
> It is extremely good to see Org-mode builds against Emacs-24 with zero
> warnings. 

I just see that this broke XEmacs... but there is already a
compatibility macro defined, so simply use it.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: use org-no-warnings macro for XEmacs compatibility --]
[-- Type: text/x-patch, Size: 4485 bytes --]

From 64b63af7bd7dbd974bef2e70c6ea0fc5b9b3d982 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Fri, 18 May 2012 13:16:11 +0200
Subject: [PATCH] use org-no-warnings macro for XEmacs compatibility

* lisp/org-agenda.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org-bbdb.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org-clock.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org.el: Replace with-no-warnings with org-no-warnings (defined
  in org-macs.el).
---
 lisp/org-agenda.el |    4 ++--
 lisp/org-bbdb.el   |    2 +-
 lisp/org-clock.el  |    4 ++--
 lisp/org.el        |    8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 07e6a4f..cfd3e25 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -91,8 +91,8 @@ (defvar org-habit-show-habits-only-for-today)
 (defvar org-agenda-buffer-name)
 (defvar org-agenda-overriding-header)
 (defvar org-agenda-title-append nil)
-(with-no-warnings (defvar entry)) ;; unprefixed, from calendar.el
-(with-no-warnings (defvar date))  ;; unprefixed, from calendar.el
+(org-no-warnings (defvar entry)) ;; unprefixed, from calendar.el
+(org-no-warnings (defvar date))  ;; unprefixed, from calendar.el
 (defvar org-agenda-undo-list)
 (defvar org-agenda-pending-undo-list)
 (defvar original-date) ; dynamically scoped, calendar.el does scope this
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 18f1dc9..51b0083 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -122,7 +122,7 @@
 (declare-function calendar-leap-year-p "calendar" (year))
 (declare-function diary-ordinal-suffix "diary-lib" (n))
 
-(with-no-warnings (defvar date)) ;; unprefixed, from calendar.el
+(org-no-warnings (defvar date)) ;; unprefixed, from calendar.el
 
 ;; Customization
 
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 0e08eb9..70c015b 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1379,7 +1379,7 @@ (defun org-clock-out (&optional fail-quietly at-time)
       (if fail-quietly (throw 'exit t) (error "No active clock")))
     (let (ts te s h m remove)
       (save-excursion ; Do not replace this with `with-current-buffer'.
-	(with-no-warnings (set-buffer (org-clocking-buffer)))
+	(org-no-warnings (set-buffer (org-clocking-buffer)))
 	(save-restriction
 	  (widen)
 	  (goto-char org-clock-marker)
@@ -1523,7 +1523,7 @@ (defun org-clock-cancel ()
     (force-mode-line-update)
     (error "No active clock"))
   (save-excursion ; Do not replace this with `with-current-buffer'.
-    (with-no-warnings (set-buffer (org-clocking-buffer)))
+    (org-no-warnings (set-buffer (org-clocking-buffer)))
     (goto-char org-clock-marker)
     (delete-region (1- (point-at-bol)) (point-at-eol))
     ;; Just in case, remove any empty LOGBOOK left over
diff --git a/lisp/org.el b/lisp/org.el
index 835e422..11cf70d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -214,7 +214,7 @@ (defcustom org-clone-delete-id nil
   (defun org-git-version () "N/A !!check installation!!")
   (and (load (concat (org-find-library-dir "org") "../UTILITIES/org-fixup.el")
 	    'noerror 'nomessage 'nosuffix)
-       (with-no-warnings (org-fixup))))
+       (org-no-warnings (org-fixup))))
 ;;;###autoload
 (defun org-version (&optional here)
   "Show the org-mode version in the echo area.
@@ -4901,9 +4901,9 @@ (defvar org-finish-function nil
 
 ;; FIXME: Occasionally check by commenting these, to make sure
 ;;        no other functions uses these, forgetting to let-bind them.
-(with-no-warnings (defvar entry)) ;; unprefixed, from calendar.el
+(org-no-warnings (defvar entry)) ;; unprefixed, from calendar.el
 (defvar org-last-state)
-(with-no-warnings (defvar date)) ;; unprefixed, from calendar.el
+(org-no-warnings (defvar date)) ;; unprefixed, from calendar.el
 
 ;; Defined somewhere in this file, but used before definition.
 (defvar org-entities)     ;; defined in org-entities.el
@@ -15577,7 +15577,7 @@ (defun org-order-calendar-date-args (arg1 arg2 arg3)
 	(list arg2 arg1 arg3))
        ((eq calendar-date-style 'iso)
 	(list arg2 arg3 arg1)))
-    (with-no-warnings ;; european-calendar-style is obsolete as of version 23.1
+    (org-no-warnings ;; european-calendar-style is obsolete as of version 23.1
       (if (org-bound-and-true-p european-calendar-style)
 	  (list arg2 arg1 arg3)
 	(list arg1 arg2 arg3)))))
-- 
1.7.9.2


[-- Attachment #3: Type: text/plain, Size: 199 bytes --]



Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds