diff options
| author | Daniel Colascione | 2014-03-22 23:16:14 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2014-03-22 23:16:14 -0700 |
| commit | a41475e146758ae24e800bbb18fd3fae4b5ef3b7 (patch) | |
| tree | 5d11f6136f1ff497b8d130cf136bfe59bcc9afba | |
| parent | e4e40f72f3cfd29c98f6a450490cdb4caf1bdc68 (diff) | |
| download | emacs-a41475e146758ae24e800bbb18fd3fae4b5ef3b7.tar.gz emacs-a41475e146758ae24e800bbb18fd3fae4b5ef3b7.zip | |
Backport memory info in bug reports (2014-03-21T21:27:25Z!dancol@dancol.org) from trunk
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/emacsbug.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a0840031b2..b73bb1e67d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-21 Daniel Colascione <dancol@dancol.org> | ||
| 2 | |||
| 3 | * mail/emacsbug.el (report-emacs-bug): Include memory usage | ||
| 4 | information in bug reports. | ||
| 5 | |||
| 1 | 2014-03-23 Daniel Colascione <dancol@dancol.org> | 6 | 2014-03-23 Daniel Colascione <dancol@dancol.org> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop' | 8 | * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop' |
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 0f72d24ed1e..b994949e94d 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el | |||
| @@ -322,6 +322,10 @@ usually do not have translators for other languages.\n\n"))) | |||
| 322 | shadows))) | 322 | shadows))) |
| 323 | (insert (format "\nFeatures:\n%s\n" features)) | 323 | (insert (format "\nFeatures:\n%s\n" features)) |
| 324 | (fill-region (line-beginning-position 0) (point)) | 324 | (fill-region (line-beginning-position 0) (point)) |
| 325 | |||
| 326 | (insert (format "\nMemory information:\n")) | ||
| 327 | (pp (garbage-collect) (current-buffer)) | ||
| 328 | |||
| 325 | ;; This is so the user has to type something in order to send easily. | 329 | ;; This is so the user has to type something in order to send easily. |
| 326 | (use-local-map (nconc (make-sparse-keymap) (current-local-map))) | 330 | (use-local-map (nconc (make-sparse-keymap) (current-local-map))) |
| 327 | (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug) | 331 | (define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug) |