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

[Richard M. Stallman]

Index: emacs/lisp/mail/mailabbrev.el
diff -c emacs/lisp/mail/mailabbrev.el:1.63 emacs/lisp/mail/mailabbrev.el:1.64
*** emacs/lisp/mail/mailabbrev.el:1.63  Sat Feb  9 04:45:44 2002
--- emacs/lisp/mail/mailabbrev.el       Wed Feb 13 10:59:53 2002
***************
*** 317,323 ****
    (setq name (downcase name))
    ;; use an abbrev table instead of an alist for mail-abbrevs.
    (let ((abbrevs-changed abbrevs-changed))  ; protect this from being changed.
!     (define-abbrev mail-abbrevs name definition 'mail-abbrev-expand-hook)))
  
  
  (defun mail-resolve-all-aliases ()
--- 317,323 ----
    (setq name (downcase name))
    ;; use an abbrev table instead of an alist for mail-abbrevs.
    (let ((abbrevs-changed abbrevs-changed))  ; protect this from being changed.
!     (define-abbrev mail-abbrevs name definition 'mail-abbrev-expand-hook 0 
t)))
  
  
  (defun mail-resolve-all-aliases ()
***************
*** 418,424 ****
         (looking-at mail-abbrev-mode-regexp))
       ;;
       ;; ...and are we in the headers?
!      (< (point) (mail-header-end)))))
  
  (defvar mail-mode-abbrev-table) ; quiet the compiler
  
--- 418,429 ----
         (looking-at mail-abbrev-mode-regexp))
       ;;
       ;; ...and are we in the headers?
!      (< (point)
!       (save-restriction
!         (widen)
!         (save-excursion
!           (rfc822-goto-eoh)
!           (point)))))))
  
  (defvar mail-mode-abbrev-table) ; quiet the compiler
  
***************
*** 464,469 ****
--- 469,475 ----
                              (if (equal value _)
                                  (set-char-table-range tab key w))))
                  tab)
+                (modify-syntax-entry ?@ "w" tab)
                 (setq mail-abbrev-syntax-table tab)))
  
             ;; If the character just typed was non-alpha-symbol-syntax,