aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorPaul Eggert2011-01-17 11:24:36 -0800
committerPaul Eggert2011-01-17 11:24:36 -0800
commit15ef8755824eef3336ebb95dbeacb39214f89503 (patch)
tree6fa45b0bd14c8af9f1ae202cb9759985a916fbf6 /src/coding.c
parent3cbecb8f286aa3309f68d9909317e03df4f597d6 (diff)
parent717c30e0027175fc8bb849728e5c9b4c3e9b2adf (diff)
downloademacs-15ef8755824eef3336ebb95dbeacb39214f89503.tar.gz
emacs-15ef8755824eef3336ebb95dbeacb39214f89503.zip
Merge from mainline.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/coding.c b/src/coding.c
index 5f9b207c6b3..06f3fe58df1 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2631,10 +2631,6 @@ decode_coding_emacs_mule (struct coding_system *coding)
2631 } 2631 }
2632 continue; 2632 continue;
2633 2633
2634 src = src_base;
2635 consumed_chars = consumed_chars_base;
2636 continue;
2637
2638 invalid_code: 2634 invalid_code:
2639 EMACS_MULE_MAYBE_FINISH_COMPOSITION (); 2635 EMACS_MULE_MAYBE_FINISH_COMPOSITION ();
2640 src = src_base; 2636 src = src_base;
@@ -10901,4 +10897,3 @@ emacs_strerror (int error_number)
10901} 10897}
10902 10898
10903#endif /* emacs */ 10899#endif /* emacs */
10904