-;;; mh-inc.el --- MH-E `inc' and separate mail spool handling
-;;
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;;; mh-inc.el --- MH-E "inc" and separate mail spool handling
+
+;; Copyright (C) 2003-2004, 2006-2011
+;; Free Software Foundation, Inc.
;; Author: Peter S. Galbraith <psg@debian.org>
;; Maintainer: Bill Wohler <wohler@newt.com>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
-;; Support for inc. In addition to reading from the system mailbox, inc can
-;; also be used to incorporate mail from multiple spool files into separate
-;; folders. See `C-h v mh-inc-spool-list'.
+;; Support for inc. In addition to reading from the system mailbox,
+;; inc can also be used to incorporate mail from multiple spool files
+;; into separate folders. See "C-h v mh-inc-spool-list".
;;; Change Log:
;;; Code:
-(eval-when-compile (require 'cl))
-
-(defvar mh-inc-spool-map (make-sparse-keymap)
- "Keymap for MH-E's mh-inc-spool commands.")
+(require 'mh-e)
+(mh-require-cl)
(defvar mh-inc-spool-map-help nil
- "Help text to for `mh-inc-spool-map'.")
+ "Help text for `mh-inc-spool-map'.")
(define-key mh-inc-spool-map "?"
'(lambda ()
(interactive)
(if mh-inc-spool-map-help
- (mh-ephem-message (substring mh-inc-spool-map-help 0 -1))
+ (mh-help mh-inc-spool-map-help)
(mh-ephem-message
- "There are no keys defined yet. Customize `mh-inc-spool-list'"))))
+ "There are no keys defined yet; customize `mh-inc-spool-list'"))))
+
+;;;###mh-autoload
+(defun mh-inc-spool-make ()
+ "Make all commands and defines keys for contents of `mh-inc-spool-list'."
+ (setq mh-inc-spool-map-help nil)
+ (when mh-inc-spool-list
+ (loop for elem in mh-inc-spool-list
+ do (let ((spool (nth 0 elem))
+ (folder (nth 1 elem))
+ (key (nth 2 elem)))
+ (progn
+ (mh-inc-spool-generator folder spool)
+ (mh-inc-spool-def-key key folder))))))
+
+(defalias 'mh-inc-spool-make-no-autoload 'mh-inc-spool-make)
(defun mh-inc-spool-generator (folder spool)
"Create a command to inc into FOLDER from SPOOL file."
(set spool1 spool)
(setf (symbol-function (intern (concat "mh-inc-spool-" folder)))
`(lambda ()
- ,(format "Inc spool file %s into folder %s" spool folder)
+ ,(format "Inc spool file %s into folder %s." spool folder)
(interactive)
(mh-inc-folder ,spool1 (concat "+" ,folder1))))))
(when (not (= 0 key))
(define-key mh-inc-spool-map (format "%c" key)
(intern (concat "mh-inc-spool-" folder)))
- (setq mh-inc-spool-map-help (concat mh-inc-spool-map-help "["
- (char-to-string key)
- "] inc " folder " folder\n"))))
-
-;; Avoid compiler warning
-(eval-when-compile (defvar mh-inc-spool-list))
-
-(defun mh-inc-spool-make ()
- "Make all commands and defines keys for contents of `mh-inc-spool-list'."
- (when mh-inc-spool-list
- (setq mh-inc-spool-map-help nil)
- (loop for elem in mh-inc-spool-list
- do (let ((spool (nth 0 elem))
- (folder (nth 1 elem))
- (key (nth 2 elem)))
- (progn
- (mh-inc-spool-generator folder spool)
- (mh-inc-spool-def-key key folder))))))
-
-;;;###mh-autoload
-(defun mh-inc-spool-list-set (symbol value)
- "Set-default SYMBOL to VALUE to update the `mh-inc-spool-list' variable.
-Also rebuilds the user commands.
-This is called after 'customize is used to alter `mh-inc-spool-list'."
- (set-default symbol value)
- (mh-inc-spool-make))
+ (add-to-list 'mh-inc-spool-map-help
+ (concat "[" (char-to-string key) "] inc " folder " folder\n")
+ t)))
(provide 'mh-inc)
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
-;;; arch-tag: 3713cf2a-6082-4cb4-8ce2-99d9acaba835
;;; mh-inc.el ends here
HCoop / bpt / emacs.git / blobdiff