diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-02-03 23:54:45 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-02-03 23:54:45 -0800 |
| commit | 1829a1fc85b040912dc194806c64670096ddcf43 (patch) | |
| tree | e2ea31dde9caa974a251a5e943e8eb0588801dd9 /lisp/emacs-lisp | |
| parent | 535e2bef6dd7b9abe2567f865c8b24a06a555178 (diff) | |
| parent | ae26c8a7a46ffa6266a4efce592827cf47e85170 (diff) | |
| download | emacs-1829a1fc85b040912dc194806c64670096ddcf43.tar.gz emacs-1829a1fc85b040912dc194806c64670096ddcf43.tar.bz2 emacs-1829a1fc85b040912dc194806c64670096ddcf43.zip | |
Merge from origin/emacs-25
ea26c8a * lisp/net/browse-url.el (browse-url-default-browser): Lower
priority of non-free Chrome.
0fac75f Improve the custom type of some user options.
2df0e04 Highlight CSS variables with variable name face
3cf5e81 * lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not
user-serviceable.
2a5233c Mark some user options that can get evalled as risky.
39b166f Disable DebPrint in sys_read on MS-Windows
9fd0189 ;Fix ChangeLog entry
4bb7233 Fix typos in Introduction to Emacs Lisp manual
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 5b841e88165..e8484fa1f94 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -225,6 +225,7 @@ After execution is resumed, the error is signaled again." "If non-nil, an expression to test for at every stop point. If the result is non-nil, then break. Errors are ignored." :type 'sexp + :risky t :group 'edebug) (defcustom edebug-sit-for-seconds 1 |