Browse Source

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.
Carsten Dominik 16 years ago
parent
commit
281a116938
3 changed files with 3 additions and 7 deletions
  1. 2 0
      lisp/ChangeLog
  2. 0 7
      lisp/org-compat.el
  3. 1 0
      lisp/org-feed.el

+ 2 - 0
lisp/ChangeLog

@@ -1,5 +1,7 @@
 2009-04-14  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* 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

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

+ 1 - 0
lisp/org-feed.el

@@ -92,6 +92,7 @@
 ;;; Code:
 
 (require 'org)
+(require 'sha1)
 
 (declare-function url-retrieve-synchronously "url" (url))