summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-05-18 13:16:11 +0200
committerBastien Guerry <bzg@altern.org>2012-05-19 09:48:57 +0200
commit595d45128013be45602945986ca4f846e63ae6e8 (patch)
tree99366feadf2946e4e64d94130dc1be318f05639c
parent160cde6c0e4b8e02c5897c71301eca61d9f04e21 (diff)
downloadorg-mode-595d45128013be45602945986ca4f846e63ae6e8.tar.gz
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).
-rw-r--r--lisp/org-agenda.el4
-rw-r--r--lisp/org-bbdb.el2
-rw-r--r--lisp/org-clock.el4
-rw-r--r--lisp/org.el8
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-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 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
(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 @@ UPDOWN tells whether to change 'up or 'down."
(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 @@ identifier."
(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 @@ This is for getting out of special buffers like remember.")
;; 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 @@ user function argument order change dependent on argument order."
(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)))))