From 2c6ee63db591621ec3ab801cffe501cb3527ee39 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 12 Dec 2008 15:26:46 +0000 Subject: [PATCH] All callers to pmail-output-to-pmail-file changed to pmail-output-to-babyl-file. --- lisp/mail/pmail.el | 16 ++++++++-------- lisp/mail/pmailsum.el | 15 +++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lisp/mail/pmail.el b/lisp/mail/pmail.el index 73301ee444..941f41ed9d 100644 --- a/lisp/mail/pmail.el +++ b/lisp/mail/pmail.el @@ -600,7 +600,7 @@ by substituting the new message number into the existing list.") :type 'file :group 'pmail-files) (defcustom pmail-default-pmail-file "~/XMAIL" - "*Default file name for \\[pmail-output-to-pmail-file]." + "*Default file name for \\[pmail-output-to-babyl-file]." :type 'file :group 'pmail-files) (defcustom pmail-default-body-file "~/mailout" @@ -987,7 +987,7 @@ The buffer is expected to be narrowed to just the header of the message." (define-key pmail-mode-map "n" 'pmail-next-undeleted-message) (define-key pmail-mode-map "\en" 'pmail-next-message) (define-key pmail-mode-map "\e\C-n" 'pmail-next-labeled-message) - (define-key pmail-mode-map "o" 'pmail-output-to-pmail-file) + (define-key pmail-mode-map "o" 'pmail-output-to-babyl-file) (define-key pmail-mode-map "\C-o" 'pmail-output) (define-key pmail-mode-map "p" 'pmail-previous-undeleted-message) (define-key pmail-mode-map "\ep" 'pmail-previous-message) @@ -1038,7 +1038,7 @@ The buffer is expected to be narrowed to just the header of the message." '("Output (inbox)..." . pmail-output)) (define-key pmail-mode-map [menu-bar classify output] - '("Output (Pmail)..." . pmail-output-to-pmail-file)) + '("Output (Pmail)..." . pmail-output-to-babyl-file)) (define-key pmail-mode-map [menu-bar classify kill-label] '("Kill Label..." . pmail-kill-label)) @@ -1206,7 +1206,7 @@ Instead, these commands are available: \\[pmail-reply] Reply to this message. Like \\[pmail-mail] but initializes some fields. \\[pmail-retry-failure] Send this message again. Used on a mailer failure message. \\[pmail-forward] Forward this message to another user. -\\[pmail-output-to-pmail-file] Output this message to an Pmail file (append it). +\\[pmail-output-to-babyl-file] Output this message to an Pmail file (append it). \\[pmail-output] Output this message to a Unix-format mail file (append it). \\[pmail-output-body-to-file] Save message body to a file. Default filename comes from Subject line. \\[pmail-input] Input Pmail file. Run Pmail on that file. @@ -1256,7 +1256,7 @@ Instead, these commands are available: ;; because they contain no info except attribute changes ;; and deletion of messages. ;; The one exception is when messages are copied into an Pmail mode buffer. - ;; pmail-output-to-pmail-file enables auto save when you do that. + ;; pmail-output-to-babyl-file enables auto save when you do that. (setq buffer-auto-save-file-name nil) (setq mode-line-modified "--") (use-local-map pmail-mode-map) @@ -1532,7 +1532,7 @@ original copy." (cons "Output Pmail File" (pmail-list-to-menu "Output Pmail File" files - 'pmail-output-to-pmail-file)))) + 'pmail-output-to-babyl-file)))) (define-key pmail-mode-map [menu-bar classify input-menu] '("Input Pmail File" . pmail-disable-menu)) @@ -2645,7 +2645,7 @@ Called when a new message is displayed." (pmail-delete-forward) (if (string= "/dev/null" folder) (pmail-delete-message) - (pmail-output-to-pmail-file folder 1 t) + (pmail-output-to-babyl-file folder 1 t) (setq d nil)))) (setq d (cdr d)))))) @@ -3799,7 +3799,7 @@ TOKEN and INDENT are not used." TEXT and INDENT are not used." (speedbar-with-attached-buffer (message "Moving message to %s" token) - (pmail-output-to-pmail-file token))) + (pmail-output-to-babyl-file token))) ; Functions for setting, getting and encoding the POP password. ; The password is encoded to prevent it from being easily accessible diff --git a/lisp/mail/pmailsum.el b/lisp/mail/pmailsum.el index 478bacc228..eaf3975d9a 100644 --- a/lisp/mail/pmailsum.el +++ b/lisp/mail/pmailsum.el @@ -912,7 +912,7 @@ Search, the `unseen' attribute is restored.") (define-key pmail-summary-mode-map "n" 'pmail-summary-next-msg) (define-key pmail-summary-mode-map "\en" 'pmail-summary-next-all) (define-key pmail-summary-mode-map "\e\C-n" 'pmail-summary-next-labeled-message) - (define-key pmail-summary-mode-map "o" 'pmail-summary-output-to-pmail-file) + (define-key pmail-summary-mode-map "o" 'pmail-summary-output-to-babyl-file) (define-key pmail-summary-mode-map "\C-o" 'pmail-summary-output) (define-key pmail-summary-mode-map "p" 'pmail-summary-previous-msg) (define-key pmail-summary-mode-map "\ep" 'pmail-summary-previous-all) @@ -979,7 +979,7 @@ Search, the `unseen' attribute is restored.") '("Output (inbox)..." . pmail-summary-output)) (define-key pmail-summary-mode-map [menu-bar classify output] - '("Output (Pmail)..." . pmail-summary-output-to-pmail-file)) + '("Output (Pmail)..." . pmail-summary-output-to-babyl-file)) (define-key pmail-summary-mode-map [menu-bar classify kill-label] '("Kill Label..." . pmail-summary-kill-label)) @@ -1561,7 +1561,7 @@ see the documentation of `pmail-resend'." ;; Summary output commands. -(defun pmail-summary-output-to-pmail-file (&optional file-name n) +(defun pmail-summary-output-to-babyl-file (&optional file-name n) "Append the current message to an Pmail file named FILE-NAME. If the file does not exist, ask if it should be created. If file is being visited, the message is appended to the Emacs @@ -1584,12 +1584,15 @@ starting with the current one. Deleted messages are skipped and don't count." (setq i (1+ i)) (with-current-buffer pmail-buffer (let ((pmail-delete-after-output nil)) - (pmail-output-to-pmail-file file-name 1))) + (pmail-output-to-babyl-file file-name 1))) (if pmail-delete-after-output (pmail-summary-delete-forward nil) (if (< i n) (pmail-summary-next-msg 1)))))) +(defalias 'pmail-summary-output-to-pmail-file + 'pmail-summary-output-to-babyl-file) + (defun pmail-summary-output (&optional file-name n) "Append this message to Unix mail file named FILE-NAME. @@ -1618,7 +1621,7 @@ starting with the current one. Deleted messages are skipped and don't count." (defun pmail-summary-output-menu () "Output current message to another Pmail file, chosen with a menu. -Also set the default for subsequent \\[pmail-output-to-pmail-file] commands. +Also set the default for subsequent \\[pmail-output-to-babyl-file] commands. The variables `pmail-secondary-file-directory' and `pmail-secondary-file-regexp' control which files are offered in the menu." (interactive) @@ -1642,7 +1645,7 @@ The variables `pmail-secondary-file-directory' and (cons "Output Pmail File" (pmail-list-to-menu "Output Pmail File" files - 'pmail-summary-output-to-pmail-file)))) + 'pmail-summary-output-to-babyl-file)))) (define-key pmail-summary-mode-map [menu-bar classify input-menu] '("Input Pmail File" . pmail-disable-menu)) (define-key pmail-summary-mode-map [menu-bar classify output-menu] -- 2.39.2