From 281a116938e68dfe18b4b146aa7f329c51d976d1 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 14 Apr 2009 18:02:41 +0200 Subject: [PATCH] Feeds: Avoid problems with sha1.el in Emacs 22 sha1-string is not autoloaded in sha1.el as in the version distributed with Emacs 22. Instead of relying on autoloads, the sha1 library is now required by org-feed.el. --- lisp/ChangeLog | 2 ++ lisp/org-compat.el | 7 ------- lisp/org-feed.el | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 425865ef6..680bcba1b 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2009-04-14 Carsten Dominik + * org-compat.el (org-sha1-string): Function removed. + * org.el (org-refile-allow-creating-parent-nodes): New option. (org-refile-get-location): New argument NEW-NODES. (org-refile): Call `org-refile-get-location' with the new diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 0e499a9e4..b25d23be8 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -319,13 +319,6 @@ that can be added." (setq n (1- n))) n)) -(defun org-sha1-string (s &optional binary) - (if (fboundp 'sha1-string) - (sha1-string s binary) - (with-temp-buffer - (insert s) - (sha1-region (point-min) (point-max) binary)))) - (provide 'org-compat) ;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe diff --git a/lisp/org-feed.el b/lisp/org-feed.el index 2aa4ee831..fca71f7a4 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -92,6 +92,7 @@ ;;; Code: (require 'org) +(require 'sha1) (declare-function url-retrieve-synchronously "url" (url))