]> code.delx.au - gnu-emacs/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:17:21 +0000 (10:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:17:21 +0000 (10:17 -0700)
commita660037698bce151915e6e084593071134df1331
tree789eea5ae877ce84973daefbb1a7d9256297c75e
parent821b6002127fba1e5b57d39e63eabd0ae189f6af
parentbb7b23c5cbd0659a9e913ea4c4642bffe83541ef
Merge from origin/emacs-24

bb7b23c In `debug' don't try using window on inaccessible frame (Bug#17170).

Conflicts:
lisp/ChangeLog
lisp/ChangeLog
lisp/emacs-lisp/debug.el