diff options
| author | Gustav Hållberg <gustav@gmail.com> | 2015-04-08 21:46:28 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-08 21:46:28 -0400 |
| commit | 0ae9ae36f0fbac47fb35efbd45d8cdda302f2e36 (patch) | |
| tree | 3a8e25e565f6e8674d37be46d63bada188e48612 /lisp/emacs-lisp | |
| parent | 4f08fb5aaa08cc66cfd8d62a928abe016668f29e (diff) | |
| download | emacs-0ae9ae36f0fbac47fb35efbd45d8cdda302f2e36.tar.gz emacs-0ae9ae36f0fbac47fb35efbd45d8cdda302f2e36.tar.bz2 emacs-0ae9ae36f0fbac47fb35efbd45d8cdda302f2e36.zip | |
(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).
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 9 |
1 files changed, 7 insertions, 2 deletions
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 |