[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/mailabbrev.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/mailabbrev.el |
Date: |
Tue, 04 Jan 2005 10:21:23 -0500 |
Index: emacs/lisp/mail/mailabbrev.el
diff -c emacs/lisp/mail/mailabbrev.el:1.74 emacs/lisp/mail/mailabbrev.el:1.75
*** emacs/lisp/mail/mailabbrev.el:1.74 Tue Sep 30 12:44:53 2003
--- emacs/lisp/mail/mailabbrev.el Tue Jan 4 14:59:27 2005
***************
*** 305,314 ****
end (string-match "\"[ \t,]*" definition start))
(setq end (string-match "[ \t,]+" definition start)))
(setq end (string-match "[ \t\n,]*,[ \t\n,]*" definition start)))
! (setq result (cons (substring definition start end) result))
! (setq start (and end
! (/= (match-end 0) L)
! (match-end 0))))
(setq definition (mapconcat (function identity)
(nreverse result)
mail-alias-separator-string)))
--- 305,323 ----
end (string-match "\"[ \t,]*" definition start))
(setq end (string-match "[ \t,]+" definition start)))
(setq end (string-match "[ \t\n,]*,[ \t\n,]*" definition start)))
! (let ((tem (substring definition start end)))
! ;; Advance the loop past this address.
! (setq start (and end
! (/= (match-end 0) L)
! (match-end 0)))
! ;; If the full name contains a problem character, quote it.
! (when (string-match "\\(.+?\\)[ \t]*\\(<.*>\\)" tem)
! (if (string-match "[^- !#$%&'*+/0-9=?A-Za-z^_`{|}~]"
! (match-string 1 tem))
! (setq tem (replace-regexp-in-string
! "\\(.+?\\)[ \t]*\\(<.*>\\)" "\"\\1\" \\2"
! tem))))
! (push tem result)))
(setq definition (mapconcat (function identity)
(nreverse result)
mail-alias-separator-string)))
***************
*** 485,491 ****
;; the usual syntax table.
(or (and (integerp last-command-char)
! (eq (char-syntax last-command-char) ?_))
(let ((pre-abbrev-expand-hook nil)) ; That's us; don't loop.
;; Use this table so that abbrevs can have hyphens in them.
(set-syntax-table mail-abbrev-syntax-table)
--- 494,502 ----
;; the usual syntax table.
(or (and (integerp last-command-char)
! (or (eq (char-syntax last-command-char) ?_)
! ;; Don't expand on @.
! (memq last-command-char '(?@ ?. ?% ?! ?_ ?-))))
(let ((pre-abbrev-expand-hook nil)) ; That's us; don't loop.
;; Use this table so that abbrevs can have hyphens in them.
(set-syntax-table mail-abbrev-syntax-table)
***************
*** 610,616 ****
(interactive "P")
(if (looking-at "[ \t]*\n") (expand-abbrev))
(setq this-command 'end-of-buffer)
! (end-of-buffer arg))
(eval-after-load "sendmail"
'(progn
--- 621,628 ----
(interactive "P")
(if (looking-at "[ \t]*\n") (expand-abbrev))
(setq this-command 'end-of-buffer)
! (with-no-warnings
! (end-of-buffer arg)))
(eval-after-load "sendmail"
'(progn
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/mail/mailabbrev.el,
Richard M . Stallman <=