浏览代码

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
Achim Gratz 14 年之前
父节点
当前提交
95bb16661b
共有 5 个文件被更改,包括 18 次插入2 次删除
  1. 1 0
      lisp/ob-ref.el
  2. 1 0
      lisp/ob.el
  3. 6 0
      lisp/org-agenda.el
  4. 7 1
      lisp/org-macs.el
  5. 3 1
      lisp/org.el

+ 1 - 0
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))

+ 1 - 0
lisp/ob.el

@@ -30,6 +30,7 @@
 
 ;;; Code:
 (eval-when-compile
+  (require 'org-list)
   (require 'cl))
 (require 'org-macs)
 

+ 6 - 0
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)))

+ 7 - 1
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))

+ 3 - 1
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))