From 23fa9dab05cfb34a1aa676273435188807d7c0aa Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Thu, 18 Nov 2010 21:19:36 +0100 Subject: [PATCH] Keep byte compiler happy --- lisp/ob-ref.el | 1 + lisp/ob.el | 1 + lisp/org-agenda.el | 12 ++++++------ lisp/org-macs.el | 8 +++++++- lisp/org.el | 4 +++- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el index e482cb8..83a4a75 100644 --- a/lisp/ob-ref.el +++ b/lisp/ob-ref.el @@ -51,6 +51,7 @@ ;;; Code: (require 'ob) (eval-when-compile + (require 'org-list) (require 'cl)) (declare-function org-remove-if-not "org" (predicate seq)) diff --git a/lisp/ob.el b/lisp/ob.el index 96c2744..0beed86 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -30,6 +30,7 @@ ;;; Code: (eval-when-compile + (require 'org-list) (require 'cl)) (require 'org-macs) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b7de45a..dfc70ca 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -921,6 +921,12 @@ This function makes sure that dates are aligned for easy reading." :group 'org-agenda :type 'boolean) +(defcustom org-agenda-time-leading-zero nil + "Non-nil means use leading zero for military times in agenda. +For example, 9:30am would become 09:30 rather than 9:30." + :group 'org-agenda-daily/weekly + :type 'boolean) + (defun org-agenda-time-of-day-to-ampm (time) "Convert TIME of a string like '13:45' to an AM/PM style time string." (let* ((hour-number (string-to-number (substring time 0 -3))) @@ -945,12 +951,6 @@ based on `org-agenda-timegrid-use-ampm'" (org-agenda-time-of-day-to-ampm time) time)) -(defcustom org-agenda-time-leading-zero nil - "Non-nil means use leading zero for military times in agenda. -For example, 9:30am would become 09:30 rather than 9:30." - :group 'org-agenda-daily/weekly - :type 'boolean) - (defcustom org-agenda-weekend-days '(6 0) "Which days are weekend? These days get the special face `org-agenda-date-weekend' in the agenda diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 5a56123..c63b1b0 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -46,9 +46,15 @@ (if (or (> emacs-major-version 23) (and (>= emacs-major-version 23) (>= emacs-minor-version 2))) - (called-interactively-p ,kind) + (with-no-warnings (called-interactively-p ,kind)) ;; defined with no argument in <=23.1 (interactive-p)))) +(if (or (<= emacs-major-version 23) + (and (<= emacs-major-version 23) + (< emacs-minor-version 2))) + (defmacro with-silent-modifications + (org-unmodified))) + (defmacro org-bound-and-true-p (var) "Return the value of symbol VAR if it is bound, else nil." `(and (boundp (quote ,var)) ,var)) diff --git a/lisp/org.el b/lisp/org.el index 023e019..1c70ec8 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -72,7 +72,8 @@ (eval-when-compile (require 'cl) - (require 'gnus-sum)) + (require 'gnus-sum) +) (require 'calendar) ;; Emacs 22 calendar compatibility: Make sure the new variables are available @@ -3569,6 +3570,7 @@ Normal means no org-mode-specific context." (declare-function parse-time-string "parse-time" (string)) (declare-function org-attach-reveal "org-attach" (&optional if-exists)) (declare-function org-export-latex-fix-inputenc "org-latex" ()) +(declare-function orgtbl-send-table "org-table" (&optional maybe)) (defvar remember-data-file) (defvar texmathp-why) (declare-function speedbar-line-directory "speedbar" (&optional depth)) -- 1.7.1