[Emacs-diffs] Changes to emacs/lisp/org/org-wl.el,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/10/12 06:12:47

Index: org-wl.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-wl.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- org-wl.el   25 Jul 2008 23:02:16 -0000      1.6
+++ org-wl.el   12 Oct 2008 06:12:47 -0000      1.7
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06b
+;; Version: 6.09a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -53,8 +53,8 @@
 ;; Backward compatibility to old version of wl
 (declare-function wl "ext:wl" () t)
 (declare-function wl-summary-buffer-msgdb "ext:wl-folder" () t)
-(declare-function wl-folder-get-elmo-folder "ext:wl-folder"
-                 (entity &optional no-cache))
+;(declare-function wl-folder-get-elmo-folder "ext:wl-folder"
+;                (entity &optional no-cache))
 (declare-function wl-summary-goto-folder-subr "ext:wl-summary"
                  (&optional name scan-type other-window sticky interactive
                             scoring force-exit))
@@ -67,7 +67,6 @@
 (declare-function wl-summary-registered-temp-mark "ext:wl-action" (number))
 (declare-function wl-folder-goto-folder-subr "ext:wl-folder"
                  (&optional folder sticky))
-(declare-function wl-thread-open-all "ext:wl-thread" ())
 (defvar wl-init)
 (defvar wl-summary-buffer-elmo-folder)
 (defvar wl-summary-buffer-folder-name)
@@ -123,7 +122,8 @@
      (error "Error in Wanderlust link"))
  (let ((folder (match-string 1 path))
        (article (match-string 3 path)))
-   (if (not (elmo-folder-exists-p (wl-folder-get-elmo-folder folder)))
+   (if (not (elmo-folder-exists-p (org-no-warnings
+                                  (wl-folder-get-elmo-folder folder))))
        (error "No such folder: %s" folder))
    (let ((old-buf (current-buffer))
          (old-point (point-marker)))
@@ -134,7 +134,6 @@
        ;; in the old buffer.
        (set-buffer old-buf)
        (goto-char old-point))
-     (wl-thread-open-all)
      (and (wl-summary-jump-to-msg-by-message-id (org-add-angle-brackets
                                                  article))
           (wl-summary-redisplay)))))