2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7a727482d7b..d924233b796 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * buffer.c (Fforce_mode_line_update): Don't fall off end of function
+        that requires a return value.
+        (Fset_buffer_modified_p): Take advantage of this change to do
+        a tail call.
+
 2013-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * buffer.c (Frestore_buffer_modified_p): Sync it with
diff --git a/src/buffer.c b/src/buffer.c
index a528397a9d2..61b685ea5c5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1341,6 +1341,7 @@ menu bar menus and the frame title.  */)
       update_mode_lines = 10;
       current_buffer->prevent_redisplay_optimizations_p = 1;
     }
+  return all;
 }
 
 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
@@ -1362,9 +1363,7 @@ A non-nil FLAG means mark the buffer modified.  */)
      Ideally, I think there should be another mechanism for fontifying
      buffers without "modifying" buffers, or redisplay should be
      smarter about updating the `*' in mode lines.  --gerd  */
-  Fforce_mode_line_update (Qnil);
-
-  return flag;
+  return Fforce_mode_line_update (Qnil);
 }
 
 DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p,