diff options
author | Achim Gratz <Stromeko@nexgo.de> | 2010-11-19 01:37:01 +0000 |
---|---|---|
committer | David Maus <dmaus@ictsoc.de> | 2010-11-22 21:22:27 +0100 |
commit | 95bb16661b22ce83326f13304ed4ad690cc03eba (patch) | |
tree | 5998d9961c2faf1a02188907d121fa052020024e | |
parent | bd7bfd20f79a022902934fc2c61bc0bb7d32bd85 (diff) | |
download | org-mode-95bb16661b22ce83326f13304ed4ad690cc03eba.tar.gz |
Fix byte compiler warnings
* org-macs.el (org-called-interactively-p): Wrap function call in
with-no-warnings.
(with-silent-modifications) Declare macro for Emacs < 23.2.
TINYCHANGE
-rw-r--r-- | lisp/ob-ref.el | 1 | ||||
-rw-r--r-- | lisp/ob.el | 1 | ||||
-rw-r--r-- | lisp/org-agenda.el | 6 | ||||
-rw-r--r-- | lisp/org-macs.el | 8 | ||||
-rw-r--r-- | lisp/org.el | 4 |
5 files changed, 18 insertions, 2 deletions
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el index f350d61..a8a18ed 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)) @@ -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 a248068..fb0957a 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -927,6 +927,12 @@ For example, 9:30am would become 09:30 rather than 9:30." :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))) 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 0c46eec..71e9428 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) (require 'pcomplete) @@ -3571,6 +3572,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)) |