mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 11:50:38 -08:00
Code Issues Projects Releases Wiki Activity

merge trunk

Browse source
This commit is contained in:
Kenichi Handa 2011-12-05 16:03:31 +09:00
commit 2ab04b9565
191 changed files with 4807 additions and 3719 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/coding.c
View file

@ -9300,7 +9300,7 @@ frame's terminal device. */)
= TERMINAL_TERMINAL_CODING (get_terminal (terminal, 1));
Lisp_Object coding_system = CODING_ID_NAME (terminal_coding->id);
/* For backward compatibility, return nil if it is `undecided'. */
/* For backward compatibility, return nil if it is `undecided'. */
return (! EQ (coding_system, Qundecided) ? coding_system : Qnil);
}