Changeset 3024

Timestamp:

2003年03月01日 08時26分20秒 (6 years ago)

Author:

miyoshi

Message:

* loadup.el: Add international/mw32mci.el.

* international/mw32mci.el (mw32-mci-add-notify-callback): New
function.
(mw32-mci-remove-notify-callback): Ditto.
(mw32-mci-notify-event-handler): Ditto.
(mw32-mci-handle-event): Ditto.
(special-event-map): Add mw32-mci-handle-event.
(mw32-mci-notify-func): New function.
(parse-sound): Ditto.
(play-sound): Ditto.

* mail/sendmail.el (mail-font-lock-keywords): Sync up with 21.3.50.
(mail-mode): Ditto.

Files:

• work/cvs2svn/lisp/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/lisp/international/mw32mci.el (added)
• work/cvs2svn/lisp/loadup.el (modified) (1 diff)
• work/cvs2svn/lisp/mail/sendmail.el (modified) (46 diffs)

work/cvs2svn/lisp/ChangeLog.Meadow

@@ +1 @@
+2003-03-01  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * loadup.el: Add international/mw32mci.el.
+
+        * international/mw32mci.el (mw32-mci-add-notify-callback): New
+        function.
+        (mw32-mci-remove-notify-callback): Ditto.
+        (mw32-mci-notify-event-handler): Ditto.
+        (mw32-mci-handle-event): Ditto.
+        (special-event-map): Add mw32-mci-handle-event.
+        (mw32-mci-notify-func): New function.
+        (parse-sound): Ditto.
+        (play-sound): Ditto.
+
+        * mail/sendmail.el (mail-font-lock-keywords): Sync up with 21.3.50.
+        (mail-mode): Ditto.
+
-2003-02-22  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-

work/cvs2svn/lisp/loadup.el

@@ -158 +158 @@
-      (load "dos-w32")
-      (load "w32-fns")
-
+
+
-(if (eq system-type 'ms-dos)
-    (progn

work/cvs2svn/lisp/mail/sendmail.el

@@ -1 @@
-
-
-
+
+
+
+
-
-;; Maintainer: FSF
@@ -29 +30 @@
-
-;;; Code:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-*Specifies how \"From:\" fields look.
-
@@ -39 +52 @@
-        king@grassland.com (Elvis Parsley)
-If `angles', they look like:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-*Non-nil means insert BCC to self in messages to be sent.
-This is done when the message is initialized,
-
-
-
-
+
+
+
+
+
+
-*Non-nil means when sending a message wait for and display errors.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-;; Useful to set in site-init.el
-;;;###autoload
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-;; Set up mail-header-separator for use as a category text property.
@@ -77 +137 @@
-
-;;;###autoload
-var
+custom
-*Name of file to write all outgoing messages in, or nil for none.
-
-
-
-
+
+
+
+
+
+
-  "*Address to insert as default Reply-to field of outgoing messages.
-If nil, it will be initialized from the REPLYTO environment variable
-
-
-
-
+
+
+
+
+
+
-  "*If non-nil, the name of a file to use instead of `/usr/lib/aliases'.
-This file defines aliases to be expanded by the mailer; this is a different
-feature from that of defining aliases in `.mailrc' to be expanded in Emacs.
-
-
-
-
+
+
+
+
+
+
-  "*If non-nil, the name of the user's personal mail alias file.
-This file typically should be in same format as the `.mailrc' file used by
-the `Mail' or `mailx' program.
-
-
-
+
+
+
+
+
-  "Normal hook, run each time a new outgoing mail message is initialized.
-
+
+
+
+
-
-(defvar mail-aliases t
@@ -116 +187 @@
-  "The modification time of your mail alias file when it was last examined.")
-
-var
+custom
-  "*Prefix insert on lines of yanked message being replied to.
-
-
+
+
+
+
+
-  "*Number of spaces to insert at the beginning of each cited line.
-
+
+
+
-(defvar mail-yank-hooks nil
-  "Obsolete hook for modifying a citation just inserted in the mail buffer.
@@ -131 +207 @@
-It is semi-obsolete and mail agents should no longer use it.")
-
-var
+custom
-  "*Hook for modifying a citation just inserted in the mail buffer.
-
-
-
+
+
+
+
+
-
-If this hook is entirely empty (nil), a default action is taken
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defvar mail-abbrevs-loaded nil)
@@ -155 +249 @@
-
-;;;###autoload
-var
+custom
-  "*Text inserted at end of mail buffer when a message is initialized.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defvar mail-reply-action nil)
@@ -168 +275 @@
-(put 'mail-send-actions 'permanent-local t)
-
-var
+custom
-  "*A string containing header lines, to be inserted in outgoing messages.
-It is inserted before you edit the message,
-
-
-
+
+
+
+
+
-  "*If non-nil, try to show RMAIL summary buffer after returning from mail.
-The functions \\[mail-send-on-exit] or \\[mail-dont-send] select
-the RMAIL summary buffer before returning, if it exists and this variable
-)
-
-
-
-var mail-send-nonascii t
+
+
+
+
+custom mail-send-nonascii 'mime
-  "*Specify whether to allow sending non-ASCII characters in mail.
-If t, that means do allow it.  nil means don't allow it.
-`query' means ask the user each time.
+`mime' means add an appropriate MIME header if none already present.
+The default is `mime'.
-Including non-ASCII characters in a mail message can be problematical
-
+
+
+
-
-;; Note: could use /usr/ucb/mail instead of sendmail;
@@ -223 +336 @@
-  (eval-when-compile
-    (let* ((cite-chars "[>|}]")
-A-Za-z
+[:alpha:]
-           (cite-suffix (concat cite-prefix "0-9_.@-`'\"")))
-      (list '("^\\(To\\|Newsgroups\\):" . font-lock-function-name-face)
@@ -231 +344 @@
-            ;; Use EVAL to delay in case `mail-header-separator' gets changed.
-            '(eval .
-
-
+
+
+
+
-            ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
-            `(,cite-chars
@@ -240 +355 @@
-                        "\\(.*\\)")
-               (beginning-of-line) (end-of-line)
-reference
+constant
-               (4 font-lock-comment-face nil t)))
-
+\\(\n[ \t]+.*\\)*$
-              . font-lock-string-face))))
-  "Additional expressions to highlight in Mail mode.")
-
-(defvar mail-send-hook nil
-  "Normal hook run before sending mail, in Mail mode.")
-
-(defun sendmail-sync-aliases ()
@@ -266 +379 @@
-  ;; Don't leave this around from a previous message.
-  (kill-local-variable 'buffer-file-coding-system)
-
+
+
+
-  (if current-input-method
-      (inactivate-input-method))
@@ -281 +396 @@
-              (address-start (point)))
-          (insert to "\n")
-
+
+
+
+
-      (newline))
-    (if cc
@@ -287 +405 @@
-              (address-start (progn (insert "CC: ") (point))))
-          (insert cc "\n")
-
+
+
+
+
-    (if in-reply-to
-        
+       
-              (fill-column 78)
-              (address-start (point)))
-          (insert "In-reply-to: " in-reply-to "\n")
-
+
+
+
+
-    (insert "Subject: " (or subject "") "\n")
-    (if mail-default-headers
@@ -315 +439 @@
-                 (insert "\n\n-- \n")
-                 (insert-file-contents mail-signature-file))))
-
-
+
+
+
+
-    (goto-char (point-max))
-    (or (bolp) (newline)))
@@ -324 +450 @@
-  (run-hooks 'mail-setup-hook))
-
+(defcustom mail-mode-hook nil
+  "Hook run by Mail mode."
+  :group 'sendmail
+  :type 'hook
+  :options '(footnote-mode))
+
-;;;###autoload
-(defun mail-mode ()
-  "Major mode for editing mail to be sent.
-Like Text Mode but with these additional commands:
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  (interactive)
-  (kill-all-local-variables)
@@ -349 +483 @@
-  (setq buffer-offer-save t)
-  (make-local-variable 'font-lock-defaults)
-
+ t
-  (make-local-variable 'paragraph-separate)
-  (make-local-variable 'paragraph-start)
@@ -356 +490 @@
-  (make-local-variable 'fill-paragraph-function)
-  (setq fill-paragraph-function 'mail-mode-fill-paragraph)
+  ;; Allow using comment commands to add/remove quoting (this only does
+  ;; anything if mail-yank-prefix is set to a non-nil value).
+  (set (make-local-variable 'comment-start) mail-yank-prefix)
-  (make-local-variable 'adaptive-fill-regexp)
-  (setq adaptive-fill-regexp
-
+
+
-  (make-local-variable 'adaptive-fill-first-line-regexp)
-  (setq adaptive-fill-first-line-regexp
-
+
+
-  ;; `-- ' precedes the signature.  `-----' appears at the start of the
-  ;; lines that delimit forwarded messages.
@@ -367 +506 @@
-  ;; are also sometimes used and should be separators.
-  (setq paragraph-start (concat (regexp-quote mail-header-separator)
-
+
+
+
-                                page-delimiter))
-  (setq paragraph-separate paragraph-start)
-  (run-hooks 'text-mode-hook 'mail-mode-hook))
-
+
+(defun mail-header-end ()
+  "Return the buffer location of the end of headers, as a number."
+  (save-restriction
+    (widen)
+    (save-excursion
+      (rfc822-goto-eoh)
+      (point))))
+
+(defun mail-text-start ()
+  "Return the buffer location of the start of text, as a number."
+  (save-restriction
+    (widen)
+    (save-excursion
+      (rfc822-goto-eoh)
+      (forward-line 1)
+      (point))))
+
+(defun mail-sendmail-delimit-header ()
+  "Set up whatever header delimiter convention sendmail will use.
+Concretely: replace the first blank line in the header with the separator."
+  (rfc822-goto-eoh)
+  (insert mail-header-separator)
+  (point))
+
+(defun mail-sendmail-undelimit-header ()
+  "Remove header separator to put the message in correct form for sendmail.
+Leave point at the start of the delimiter line."
+  (rfc822-goto-eoh)
+  (delete-region (point) (progn (end-of-line) (point))))
+
-(defun mail-mode-auto-fill ()
-  "Carry out Auto Fill for Mail mode.
-If within the headers, this makes the new lines into continuation lines."
-
-
-
-
-
-
-
-
+
-      (let ((old-line-start (save-excursion (beginning-of-line) (point))))
-        (if (do-auto-fill)
@@ -397 +562 @@
-(defun mail-mode-fill-paragraph (arg)
-  ;; Do something special only if within the headers.
-
-
-
-
-
-
-
-
+
-      (let (beg end fieldname) 
-
-(setq beg (point
+when (prog1 (
+       (setq beg (point)
-        (setq fieldname
-      (downcase (buffer-substring beg (1- (match-end 0
+       (downcase (buffer-substring beg (1- (match-end 0)
-        (forward-line 1)
-        ;; Find continuation lines and get rid of their continuation markers.
@@ -533 +691 @@
-    (bury-buffer (current-buffer))
-    (if (and (or (window-dedicated-p (frame-selected-window))
-assq 'mail-dedicated-frame (frame-parameters
+cdr (assq 'mail-dedicated-frame (frame-parameters)
-             (not (null (delq (selected-frame) (visible-frame-list)))))
-        (delete-frame (selected-frame))
@@ -555 +713 @@
-          (switch-to-buffer newbuf))))))
-
+(defcustom mail-send-hook nil
+  "Hook run just before sending mail with `mail-send'."
+  :type 'hook
+  :options '(flyspell-mode-off)
+  :group 'sendmail)
+
-(defun mail-send ()
-  "Send the message in the current buffer.
@@ -568 +732 @@
-      (let ((inhibit-read-only t)
-            (opoint (point)))
-
-
+
-          (goto-char (point-min))
-          (skip-chars-forward "\0-\177")
@@ -579 +742 @@
-        ;; Complain about any invalid line.
-        (goto-char (point-min))
-not (looking-at (regexp-quote mail-header-separator)
+< (point) (mail-header-end
-          (unless (looking-at "[ \t]\\|.*:\\|$")
-            (push-mark opoint)
@@ -596 +759 @@
-          (setq mail-send-actions (cdr mail-send-actions)))
-        (message "Sending...done")
-
+-
-        (if (not buffer-file-name)
-            (progn
@@ -607 +770 @@
-;;;###autoload
-(defvar sendmail-coding-system nil
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun sendmail-send-it ()
+  "Send the current mail buffer using the Sendmail package.
+This is a suitable value for `send-mail-function'.  It sends using the
+external program defined by `sendmail-program'."
-  (require 'mail-utils)
-  (let ((errbuf (if mail-interactive
@@ -616 +797 @@
-        (tembuf (generate-new-buffer " sendmail temp"))
-        (case-fold-search nil)
-
+
+
+
+
-        delimline
-        fcc-was-found
-        (mailbuf (current-buffer))
-
-
-
-
-
-
+
+
+
-    (unwind-protect
-        (save-excursion
@@ -631 +812 @@
-          (erase-buffer)
-          (insert-buffer-substring mailbuf)
+          (set-buffer-file-coding-system coding)
-          (goto-char (point-max))
-          ;; require one newline at the end.
@@ -636 +818 @@
-              (insert ?\n))
-          ;; Change header-delimiter to be what sendmail expects.
-
-
-
-
-
+
+
-          (setq delimline (point-marker))
-          (sendmail-sync-aliases)
@@ -652 +831 @@
-          (goto-char (point-min))
-          (let ((case-fold-search t))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-;;; Apparently this causes a duplicate Sender.
-;;;         ;; If the From is different than current user, insert Sender.
@@ -697 +878 @@
-                       (fullname (user-full-name))
-                       (quote-fullname nil))
-\200-\3
-mail-quote-printable fullname t
+^\0-\1
+rfc2047-encode-string fullname
-                            quote-fullname t))
-                  (cond ((eq mail-from-style 'angles)
@@ -744 +925 @@
-                         (insert ")\n"))
-                        ((null mail-from-style)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            ;; Insert an extra newline if we need it to work around
-            ;; Sun's bug that swallows newlines.
@@ -765 +964 @@
-\\|^resent-cc:\\|^resent-bcc:"
-                                   delimline t))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            (or fcc-was-found
-                (error "No recipients")))
@@ -816 +1021 @@
-        (tembuf (generate-new-buffer " rmail output"))
-        (case-fold-search t))
+    (unless (markerp header-end)
+      (error "Value of `header-end' must be a marker"))
-    (save-excursion
-      (goto-char (point-min))
@@ -878 +1085 @@
-                        (if msg
-                            (progn
+                              ;; Append to an ordinary buffer as a
+                              ;; Unix mail message.
-                              (rmail-maybe-set-message-counters)
-                              (widen)
@@ -906 +1115 @@
-          ;; Append to the file directly,
-          ;; unless we've already taken care of it.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          (and buffer (not dont-write-the-file)
-               (with-current-buffer buffer
@@ -936 +1149 @@
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    ;; find the header-separator
-    (search-forward (concat "\n" mail-header-separator "\n"))
-    (forward-line -1)
-    ;; put a marker at the end of the header
-point-marker
+copy-marker (mail-header-end)
-          (case-fold-search t)
-          to-line)