merge from trunk

4 files changed, 15 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89610870f10..f5c4ee1b19e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (set-auto-mode): Simplify a bit further.
+
 2013-09-11  Glenn Morris  <rgm@gnu.org>
 
         * files.el (interpreter-mode-alist): Remove \\` \\' parts.
diff --git a/lisp/files.el b/lisp/files.el
index 5d8fbda6154..85bbc8596be 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2679,11 +2679,9 @@ we don't actually set it to the same mode the buffer already has."
          (setq done (assoc-default
                      (file-name-nondirectory mode)
                      (mapcar (lambda (e)
-                               (if (string-match-p "\\`\\\\`" (car e))
-                                   e
-                                 (cons
-                                  (format "\\`%s\\'" (car e))
-                                  (cdr e))))
+                               (cons
+                                (format "\\`%s\\'" (car e))
+                                (cdr e)))
                              interpreter-mode-alist)
                      #'string-match-p))
          ;; If we found an interpreter mode to use, invoke it now.
diff --git a/src/ChangeLog b/src/ChangeLog
index 6e527b996dd..db08fe6aae8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * insdel.c (insert_from_buffer_1): Don't mark buffer as modified when
+        insert-buffer-substring an empty string.
+
 2013-09-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,
diff --git a/src/insdel.c b/src/insdel.c
index f746fd34330..ebd096a2927 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1057,6 +1057,9 @@ insert_from_buffer_1 (struct buffer *buf,
   ptrdiff_t outgoing_nbytes = incoming_nbytes;
   INTERVAL intervals;
 
+  if (nchars == 0)
+    return;
+
   /* Make OUTGOING_NBYTES describe the text
      as it will be inserted in this buffer.  */