Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
3923e7bd
Commit
3923e7bd
authored
Jan 11, 2014
by
Kenichi Handa
Browse files
mail/rmail.el (rmail-get-coding-system): Check rmail-get-coding-function before "funcall"ing it.
parent
684d44ef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/mail/rmail.el
lisp/mail/rmail.el
+2
-1
No files found.
lisp/ChangeLog
View file @
3923e7bd
2014-01-10 K. Handa <handa@gnu.org>
* mail/rmail.el (rmail-get-coding-system): Check
rmail-get-coding-function before "funcall"ing it.
2014-01-09 Stefan Monnier <monnier@iro.umontreal.ca>
2014-01-09 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (deactivate-mark, activate-mark): Force-mode-line-update
* simple.el (deactivate-mark, activate-mark): Force-mode-line-update
...
...
lisp/mail/rmail.el
View file @
3923e7bd
...
@@ -1040,7 +1040,8 @@ This function also reinitializes local variables used by Rmail."
...
@@ -1040,7 +1040,8 @@ This function also reinitializes local variables used by Rmail."
The buffer is expected to be narrowed to just the header of the message."
The buffer is expected to be narrowed to just the header of the message."
(
save-excursion
(
save-excursion
(
goto-char
(
point-min
))
(
goto-char
(
point-min
))
(
or
(
funcall
rmail-get-coding-function
)
(
or
(
if
rmail-get-coding-function
(
funcall
rmail-get-coding-function
))
(
if
(
re-search-forward
rmail-mime-charset-pattern
nil
t
)
(
if
(
re-search-forward
rmail-mime-charset-pattern
nil
t
)
(
coding-system-from-name
(
match-string
1
))
(
coding-system-from-name
(
match-string
1
))
'undecided
))))
'undecided
))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment