diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:17:21 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:17:21 -0700 |
commit | a660037698bce151915e6e084593071134df1331 (patch) | |
tree | 789eea5ae877ce84973daefbb1a7d9256297c75e /lisp/emacs-lisp/cl-lib.el | |
parent | 821b6002127fba1e5b57d39e63eabd0ae189f6af (diff) | |
parent | bb7b23c5cbd0659a9e913ea4c4642bffe83541ef (diff) | |
download | emacs-a660037698bce151915e6e084593071134df1331.tar.gz emacs-a660037698bce151915e6e084593071134df1331.tar.bz2 emacs-a660037698bce151915e6e084593071134df1331.zip |
Merge from origin/emacs-24
bb7b23c In `debug' don't try using window on inaccessible frame (Bug#17170).
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'lisp/emacs-lisp/cl-lib.el')
0 files changed, 0 insertions, 0 deletions