Merge pull request #64 from syohex/fix-package

Fix package
kiwanami · Jun 10, 2015 · 2dbea8c · 2dbea8c
2 parents 9e4ea7f + 6311eab
commit 2dbea8c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/calfw-ical.el b/calfw-ical.el
@@ -150,7 +150,7 @@ events have not been supported yet."
     (unwind-protect
         (pp-display-expression
          (with-current-buffer buf
-           (icalendar--normalize-buffer)
+           (cfw:ical-normalize-buffer)
            (cfw:ical-convert-ical-to-calfw
             (icalendar--read-element nil nil)))
          "*ical-debug*")

diff --git a/calfw-org.el b/calfw-org.el
@@ -175,24 +175,20 @@ different agenda files from the default agenda ones.")
     ;;; ------------------------------------------------------------------------
     (setq text (replace-regexp-in-string "%[0-9A-F]\\{2\\}" " " text))
     (if (string-match org-bracket-link-regexp text)
-      (progn
-        (setq desc (if (match-end 3) (org-match-string-no-properties 3 text)))
-        (setq link (org-link-unescape (org-match-string-no-properties 1 text)))
-        (setq help (concat "LINK: " link))
-        (setq link-props
-           (list
-                 'face 'org-link
-                 'mouse-face 'highlight
-                 'help-echo help
-                 'org-link link
-                 ))
+      (let* ((desc (if (match-end 3) (org-match-string-no-properties 3 text)))
+             (link (org-link-unescape (org-match-string-no-properties 1 text)))
+             (help (concat "LINK: " link))
+             (link-props (list
+                          'face 'org-link
+                          'mouse-face 'highlight
+                          'help-echo help
+                          'org-link link)))
         (if desc
-          (progn
-            (setq desc (apply 'propertize desc link-props))
-            (setq text (replace-match desc nil nil text)))
+            (progn
+              (setq desc (apply 'propertize desc link-props))
+              (setq text (replace-match desc nil nil text)))
           (setq link (apply 'propertize link link-props))
-          (setq text (replace-match link nil nil text)))
-        ))
+          (setq text (replace-match link nil nil text)))))
     (propertize
       (concat
         (if time-str
@@ -225,9 +221,9 @@ If TEXT does not have a range, return nil."
 	 (let ((date-string  (match-string 1 dotime))
 	       (extra (cfw:org-tp text 'extra)))
 	   (if (string-match "(\\([0-9]+\\)/\\([0-9]+\\)): " extra)
-	       (let* ((cur-day (string-to-int
+	       (let* ((cur-day (string-to-number
 				(match-string 1 extra)))
-		      (total-days (string-to-int
+		      (total-days (string-to-number
 				   (match-string 2 extra)))
 		      (start-date (time-subtract
 				   (org-read-date nil t date-string)

diff --git a/calfw.el b/calfw.el
@@ -54,7 +54,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(require 'cl)
 (require 'calendar)
 (require 'holidays)