For now, revert previous rmail.el change

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1aaf0a5..4d2186b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,10 +2,6 @@
 
        * printing.el (pr-menu-bar): Define when compiling.
 
-       * mail/rmail.el (speedbar): No need to load when compiling.
-       (speedbar-make-specialized-keymap, speedbar-with-attached-buffer)
-       (speedbar-do-function-pointer): Declare.
-
 2013-05-21  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (octave-auto-fill): Remove.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d089f6d..af7ad22 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4310,6 +4310,7 @@ This has an effect only if a summary buffer exists."
                  (restore-buffer-modified-p nil)))))))
 \f
 ;;; Speedbar support for RMAIL files.
+(eval-when-compile (require 'speedbar))
 
 (defcustom rmail-speedbar-match-folder-regexp "^[A-Z0-9]+\\(\\.[A-Z0-9]+\\)?$"
   "Regexp matching Rmail folder names to be displayed in Speedbar.
@@ -4325,12 +4326,12 @@ browsing, and moving of messages."
 (defvar rmail-speedbar-key-map nil
   "Keymap used when in rmail display mode.")
 
-(declare-function speedbar-make-specialized-keymap "speedbar" ())
-
 (defun rmail-install-speedbar-variables ()
   "Install those variables used by speedbar to enhance rmail."
-  (unless rmail-speedbar-key-map
+  (if rmail-speedbar-key-map
+      nil
     (setq rmail-speedbar-key-map (speedbar-make-specialized-keymap))
+
     (define-key rmail-speedbar-key-map "e" 'speedbar-edit-line)
     (define-key rmail-speedbar-key-map "r" 'speedbar-edit-line)
     (define-key rmail-speedbar-key-map "\C-m" 'speedbar-edit-line)
@@ -4345,15 +4346,11 @@ browsing, and moving of messages."
                     (looking-at "<M> "))])
   "Additional menu-items to add to speedbar frame.")
 
-(declare-function speedbar-insert-button "speedbar"
-                 (text face mouse function &optional token prevline))
-
 ;; Make sure our special speedbar major mode is loaded
 (if (featurep 'speedbar)
     (rmail-install-speedbar-variables)
   (add-hook 'speedbar-load-hook 'rmail-install-speedbar-variables))
 
-;; Called from speedbar-add-localized-speedbar-support.
 (defun rmail-speedbar-buttons (buffer)
   "Create buttons for BUFFER containing rmail messages.
 Click on the address under Reply to: to reply to this person.
@@ -4390,8 +4387,6 @@ current message into that RMAIL folder."
            (speedbar-insert-button file 'speedbar-file-face 'highlight
                                    'rmail-speedbar-find-file nil t)))))))
 
-(declare-function speedbar-with-attached-buffer "speedbar" (&rest forms) t)
-
 (defun rmail-speedbar-button (text token indent)
   "Execute an rmail command specified by TEXT.
 The command used is TOKEN.  INDENT is not used."
@@ -4405,8 +4400,6 @@ TOKEN and INDENT are not used."
    (message "Loading in RMAIL file %s..." text)
    (rmail text)))
 
-(declare-function speedbar-do-function-pointer "speedbar" ())
-
 (defun rmail-speedbar-move-message-to-folder-on-line ()
   "If the current line is a folder, move current message to it."
   (interactive)