Browse Source

Merge branch 'maint'

Bastien Guerry 12 years ago
parent
commit
370a2bfb4f
4 changed files with 11 additions and 11 deletions
  1. 6 7
      contrib/lisp/ox-rss.el
  2. 1 1
      lisp/org-agenda.el
  3. 2 1
      lisp/org-capture.el
  4. 2 2
      lisp/org.el

+ 6 - 7
contrib/lisp/ox-rss.el

@@ -48,7 +48,7 @@
 ;;    :base-directory "~/myhomepage/"
 ;;    :base-directory "~/myhomepage/"
 ;;    :base-extension "org"
 ;;    :base-extension "org"
 ;;    :rss-image-url "http://lumiere.ens.fr/~guerry/images/faces/15.png"
 ;;    :rss-image-url "http://lumiere.ens.fr/~guerry/images/faces/15.png"
-;;    :home-link-home "http://lumiere.ens.fr/~guerry/"
+;;    :html-link-home "http://lumiere.ens.fr/~guerry/"
 ;;    :rss-extension "xml"
 ;;    :rss-extension "xml"
 ;;    :publishing-directory "/home/guerry/public_html/"
 ;;    :publishing-directory "/home/guerry/public_html/"
 ;;    :publishing-function (org-rss-publish-to-rss)
 ;;    :publishing-function (org-rss-publish-to-rss)
@@ -236,12 +236,11 @@ communication channel."
 	   (pubdate
 	   (pubdate
 	    (let ((system-time-locale "C"))
 	    (let ((system-time-locale "C"))
 	      (format-time-string
 	      (format-time-string
-	       "%a, %d %h %Y %H:%M:%S %Z"
+	       "%a, %d %h %Y %H:%M:%S %z"
 	       (org-time-string-to-time
 	       (org-time-string-to-time
 		(or (org-element-property :PUBDATE headline)
 		(or (org-element-property :PUBDATE headline)
 		    (error "Missing PUBDATE property"))))))
 		    (error "Missing PUBDATE property"))))))
-	   (title (org-rss-plain-text
-		   (org-element-property :raw-value headline) info))
+	   (title (org-element-property :raw-value headline))
 	   (publink
 	   (publink
 	    (concat
 	    (concat
 	     (file-name-as-directory
 	     (file-name-as-directory
@@ -310,7 +309,7 @@ as a communication channel."
 	 (author (and (plist-get info :with-author)
 	 (author (and (plist-get info :with-author)
 		      (let ((auth (plist-get info :author)))
 		      (let ((auth (plist-get info :author)))
 			(and auth (org-export-data auth info)))))
 			(and auth (org-export-data auth info)))))
-	 (date (format-time-string "%a, %d %h %Y %H:%M:%S %Z")) ;; RFC 882
+	 (date (format-time-string "%a, %d %h %Y %H:%M:%S %z")) ;; RFC 882
 	 (description (org-export-data (plist-get info :description) info))
 	 (description (org-export-data (plist-get info :description) info))
 	 (lang (plist-get info :language))
 	 (lang (plist-get info :language))
 	 (keywords (plist-get info :keywords))
 	 (keywords (plist-get info :keywords))
@@ -332,7 +331,7 @@ as a communication channel."
 <pubDate>%s</pubDate>
 <pubDate>%s</pubDate>
 <lastBuildDate>%s</lastBuildDate>
 <lastBuildDate>%s</lastBuildDate>
 <generator>%s</generator>
 <generator>%s</generator>
-<webMaster>%s</webMaster>
+<webMaster>%s (%s)</webMaster>
 <image>
 <image>
 <url>%s</url>
 <url>%s</url>
 <title>%s</title>
 <title>%s</title>
@@ -344,7 +343,7 @@ as a communication channel."
 		     emacs-major-version
 		     emacs-major-version
 		     emacs-minor-version)
 		     emacs-minor-version)
 	     " Org-mode " (org-version))
 	     " Org-mode " (org-version))
-     email image title blogurl)))
+     email author image title blogurl)))
 
 
 (defun org-rss-section (section contents info)
 (defun org-rss-section (section contents info)
   "Transcode SECTION element into RSS format.
   "Transcode SECTION element into RSS format.

+ 1 - 1
lisp/org-agenda.el

@@ -3879,7 +3879,7 @@ continue from there."
       (throw :skip t))))
       (throw :skip t))))
 
 
 (defun org-agenda-skip-eval (form)
 (defun org-agenda-skip-eval (form)
-  "If FORM is a function or a list, call (or eval) is and return result.
+  "If FORM is a function or a list, call (or eval) it and return the result.
 `save-excursion' and `save-match-data' are wrapped around the call, so point
 `save-excursion' and `save-match-data' are wrapped around the call, so point
 and match data are returned to the previous state no matter what these
 and match data are returned to the previous state no matter what these
 functions do."
 functions do."

+ 2 - 1
lisp/org-capture.el

@@ -909,7 +909,8 @@ Store them in the capture property list."
 				(current-time))))
 				(current-time))))
 	      (org-capture-put
 	      (org-capture-put
 	       :default-time
 	       :default-time
-	       (cond ((and (not org-time-was-given)
+	       (cond ((and (or (not (boundp 'org-time-was-given))
+			       (not org-time-was-given))
 			   (not (= (time-to-days prompt-time) (org-today))))
 			   (not (= (time-to-days prompt-time) (org-today))))
 		      ;; Use 00:00 when no time is given for another date than today?
 		      ;; Use 00:00 when no time is given for another date than today?
 		      (apply 'encode-time (append '(0 0 0) (cdddr (decode-time prompt-time)))))
 		      (apply 'encode-time (append '(0 0 0) (cdddr (decode-time prompt-time)))))

+ 2 - 2
lisp/org.el

@@ -13812,7 +13812,6 @@ headlines matching this string."
 			      (abbreviate-file-name
 			      (abbreviate-file-name
 			       (or (buffer-file-name (buffer-base-buffer))
 			       (or (buffer-file-name (buffer-base-buffer))
 				   (buffer-name (buffer-base-buffer)))))))
 				   (buffer-name (buffer-base-buffer)))))))
-	 (case-fold-search nil)
 	 (org-map-continue-from nil)
 	 (org-map-continue-from nil)
          lspos tags tags-list
          lspos tags tags-list
 	 (tags-alist (list (cons 0 org-file-tags)))
 	 (tags-alist (list (cons 0 org-file-tags)))
@@ -13825,7 +13824,8 @@ headlines matching this string."
       (when (eq action 'sparse-tree)
       (when (eq action 'sparse-tree)
 	(org-overview)
 	(org-overview)
 	(org-remove-occur-highlights))
 	(org-remove-occur-highlights))
-      (while (re-search-forward re nil t)
+      (while (let (case-fold-search)
+	       (re-search-forward re nil t))
 	(setq org-map-continue-from nil)
 	(setq org-map-continue-from nil)
 	(catch :skip
 	(catch :skip
 	  (setq todo (if (match-end 1) (org-match-string-no-properties 2))
 	  (setq todo (if (match-end 1) (org-match-string-no-properties 2))