diff options
| author | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
| commit | 2ab04b956544fc24132cee405f93c1a757ebca56 (patch) | |
| tree | f8ff3a51bac0430ed69b6497568de699f6d3b904 /src/coding.c | |
| parent | a79703f53ccd12623371263d93baf0d1be928ec7 (diff) | |
| parent | 58a70b943c3efcc25e1396c8e67bc440c43a3f0a (diff) | |
| download | emacs-2ab04b956544fc24132cee405f93c1a757ebca56.tar.gz emacs-2ab04b956544fc24132cee405f93c1a757ebca56.zip | |
merge trunk
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 99a766a915a..b1743076630 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -9300,7 +9300,7 @@ frame's terminal device. */) | |||
| 9300 | = TERMINAL_TERMINAL_CODING (get_terminal (terminal, 1)); | 9300 | = TERMINAL_TERMINAL_CODING (get_terminal (terminal, 1)); |
| 9301 | Lisp_Object coding_system = CODING_ID_NAME (terminal_coding->id); | 9301 | Lisp_Object coding_system = CODING_ID_NAME (terminal_coding->id); |
| 9302 | 9302 | ||
| 9303 | /* For backward compatibility, return nil if it is `undecided'. */ | 9303 | /* For backward compatibility, return nil if it is `undecided'. */ |
| 9304 | return (! EQ (coding_system, Qundecided) ? coding_system : Qnil); | 9304 | return (! EQ (coding_system, Qundecided) ? coding_system : Qnil); |
| 9305 | } | 9305 | } |
| 9306 | 9306 | ||