From: Gustav Hållberg <gustav@gmail.com>
Date: Thu, 9 Apr 2015 01:46:28 +0000 (-0400)
Subject: (diff-hunk-file-names): Don't require a TAB  after the file name
X-Git-Tag: emacs-25.0.90~2526
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ae9ae36f0fbac47fb35efbd45d8cdda302f2e36;p=emacs.git

(diff-hunk-file-names): Don't require a TAB  after the file name

* lisp/vc/diff-mode.el (diff-hunk-file-names): Don't require a TAB
after the file name (bug#20276).
---

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index aa7cdf96337..d0668bbe54b 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1869,8 +1869,13 @@ expressions; a `progn' form will be returned enclosing these forms."
   ;; Like body but body is wrapped in edebug-enter form.
   ;; The body is assumed to be executing inside of the function context.
   ;; Not to be used otherwise.
-  (let ((edebug-inside-func t))
-    (list (edebug-wrap-def-body (edebug-forms cursor)))))
+  (let* ((edebug-inside-func t)
+         (forms (edebug-forms cursor)))
+    ;; If there's no form, there's nothing to wrap!
+    ;; This happens to handle bug#20281, tho maybe a better fix would be to
+    ;; improve the `defun' spec.
+    (when forms
+      (list (edebug-wrap-def-body forms)))))
 
 
 ;;;; Edebug Form Specs