[Emacs-diffs] Changes to emacs/lisp/mail/mspools.el

[Juanma Barranquero]

Index: emacs/lisp/mail/mspools.el
diff -c emacs/lisp/mail/mspools.el:1.11 emacs/lisp/mail/mspools.el:1.12
*** emacs/lisp/mail/mspools.el:1.11     Fri Nov 16 16:10:58 2001
--- emacs/lisp/mail/mspools.el  Tue Feb  4 08:14:00 2003
***************
*** 196,202 ****
           mspools-vm-system-mail       ; your mailbox
           vm-crash-box                 ;crash for mailbox
           ))
!     
      ;; Mailing list inboxes
      ;; must have VM already loaded to get vm-folder-directory.
      (mapcar '(lambda (s)
--- 196,202 ----
           mspools-vm-system-mail       ; your mailbox
           vm-crash-box                 ;crash for mailbox
           ))
! 
      ;; Mailing list inboxes
      ;; must have VM already loaded to get vm-folder-directory.
      (mapcar '(lambda (s)
***************
*** 206,213 ****
                (concat mspools-folder-directory s "." mspools-suffix)
                (concat mspools-folder-directory s ".crash")))
            ;; So I create a vm-spool-files entry for each of those mail drops
!           (mapcar 'file-name-sans-extension 
!                   (directory-files mspools-folder-directory nil 
                                     (format "^[^.]+\\.%s" mspools-suffix)))
            ))
     ))
--- 206,213 ----
                (concat mspools-folder-directory s "." mspools-suffix)
                (concat mspools-folder-directory s ".crash")))
            ;; So I create a vm-spool-files entry for each of those mail drops
!           (mapcar 'file-name-sans-extension
!                   (directory-files mspools-folder-directory nil
                                     (format "^[^.]+\\.%s" mspools-suffix)))
            ))
     ))
***************
*** 225,238 ****
        (delete-region (point-min) (point-max)))
      ;; else buffer doesn't exist so create it
      (get-buffer-create mspools-buffer))
!   
    ;; generate the list of spool files
    (if mspools-using-vm
        (mspools-set-vm-spool-files))
!   
    (mspools-get-spool-files)
    (if (not noshow) (pop-to-buffer mspools-buffer))
!   
    (setq buffer-read-only t)
    (mspools-mode)
    )
--- 225,238 ----
        (delete-region (point-min) (point-max)))
      ;; else buffer doesn't exist so create it
      (get-buffer-create mspools-buffer))
! 
    ;; generate the list of spool files
    (if mspools-using-vm
        (mspools-set-vm-spool-files))
! 
    (mspools-get-spool-files)
    (if (not noshow) (pop-to-buffer mspools-buffer))
! 
    (setq buffer-read-only t)
    (mspools-mode)
    )
***************
*** 244,252 ****
      (setq spool-name (mspools-get-spool-name))
      (if (null spool-name)
        (message "No spool on current line")
!       
        (setq folder-name (mspools-get-folder-from-spool spool-name))
!       
        ;; put in a little "*" to indicate spool file has been read.
        (if (not mspools-update)
          (save-excursion
--- 244,252 ----
      (setq spool-name (mspools-get-spool-name))
      (if (null spool-name)
        (message "No spool on current line")
! 
        (setq folder-name (mspools-get-folder-from-spool spool-name))
! 
        ;; put in a little "*" to indicate spool file has been read.
        (if (not mspools-update)
          (save-excursion
***************
*** 266,272 ****
          (next-line (- 1 mspools-files-len)) ;back to top of list
        ;; else just on to next line
        (next-line 1))
!       
        ;; Choose whether to use VM or RMAIL for reading folder.
        (if mspools-using-vm
          (vm-visit-folder (concat mspools-folder-directory folder-name))
--- 266,272 ----
          (next-line (- 1 mspools-files-len)) ;back to top of list
        ;; else just on to next line
        (next-line 1))
! 
        ;; Choose whether to use VM or RMAIL for reading folder.
        (if mspools-using-vm
          (vm-visit-folder (concat mspools-folder-directory folder-name))
***************
*** 275,282 ****
        (setq rmail-inbox-list
              (list (concat mspools-folder-directory spool-name)))
        (rmail-get-new-mail))
!       
!       
        (if mspools-update
          ;; generate new list of spools.
          (save-excursion
--- 275,282 ----
        (setq rmail-inbox-list
              (list (concat mspools-folder-directory spool-name)))
        (rmail-get-new-mail))
! 
! 
        (if mspools-update
          ;; generate new list of spools.
          (save-excursion
***************
*** 313,319 ****
  (if mspools-mode-map
      ()
    (setq mspools-mode-map (make-sparse-keymap))
!   
    (define-key mspools-mode-map "\C-c\C-c" 'mspools-visit-spool)
    (define-key mspools-mode-map "\C-m" 'mspools-visit-spool)
    (define-key mspools-mode-map " " 'mspools-visit-spool)
--- 313,319 ----
  (if mspools-mode-map
      ()
    (setq mspools-mode-map (make-sparse-keymap))
! 
    (define-key mspools-mode-map "\C-c\C-c" 'mspools-visit-spool)
    (define-key mspools-mode-map "\C-m" 'mspools-visit-spool)
    (define-key mspools-mode-map " " 'mspools-visit-spool)
***************
*** 334,340 ****
  nil."
    (interactive)
    (mspools-show noshow))
!   
  (defun mspools-help ()
    "Show help for `mspools-mode'."
    (interactive)
--- 334,340 ----
  nil."
    (interactive)
    (mspools-show noshow))
! 
  (defun mspools-help ()
    "Show help for `mspools-mode'."
    (interactive)