aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/mail/mailalias.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 77630023099..cc1988d28a9 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -120,7 +120,8 @@ By default, this is the file specified by `mail-personal-alias-file'."
120 (cond ((get-file-buffer file) 120 (cond ((get-file-buffer file)
121 (insert (save-excursion 121 (insert (save-excursion
122 (set-buffer (get-file-buffer file)) 122 (set-buffer (get-file-buffer file))
123 (buffer-substring (point-min) (point-max))))) 123 (buffer-substring-no-properties
124 (point-min) (point-max)))))
124 ((file-exists-p file) (insert-file-contents file)) 125 ((file-exists-p file) (insert-file-contents file))
125 ((file-exists-p (setq file (concat "~/" file))) 126 ((file-exists-p (setq file (concat "~/" file)))
126 (insert-file-contents file)) 127 (insert-file-contents file))
@@ -139,8 +140,8 @@ By default, this is the file specified by `mail-personal-alias-file'."
139 ;; handle `source' directives -- Eddy/1994/May/25 140 ;; handle `source' directives -- Eddy/1994/May/25
140 (cond ((re-search-forward "^source[ \t]+" nil t) 141 (cond ((re-search-forward "^source[ \t]+" nil t)
141 (re-search-forward "\\S-+") 142 (re-search-forward "\\S-+")
142 (setq file 143 (setq file (buffer-substring-no-properties
143 (buffer-substring (match-beginning 0) (match-end 0))) 144 (match-beginning 0) (match-end 0)))
144 (beginning-of-line) 145 (beginning-of-line)
145 (insert "# ") ; to ensure we don't re-process this file 146 (insert "# ") ; to ensure we don't re-process this file
146 (beginning-of-line)) 147 (beginning-of-line))
@@ -153,7 +154,7 @@ By default, this is the file specified by `mail-personal-alias-file'."
153 (end-of-line) 154 (end-of-line)
154 (define-mail-alias 155 (define-mail-alias
155 name 156 name
156 (buffer-substring start (point)) 157 (buffer-substring-no-properties start (point))
157 t))) 158 t)))
158 mail-aliases) 159 mail-aliases)
159 (if buffer (kill-buffer buffer)) 160 (if buffer (kill-buffer buffer))