* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
;;; debug.el --- debuggers and related commands for Emacs -*- lexical-binding: t -*-
|
1992-05-30 23:54:21 +00:00
|
|
|
|
|
2015-01-01 14:26:41 -08:00
|
|
|
|
;; Copyright (C) 1985-1986, 1994, 2001-2015 Free Software Foundation,
|
2013-01-01 09:11:05 +00:00
|
|
|
|
;; Inc.
|
1992-07-22 04:22:30 +00:00
|
|
|
|
|
2014-02-09 17:34:22 -08:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
1993-03-18 21:29:42 +00:00
|
|
|
|
;; Keywords: lisp, tools, maint
|
1992-07-16 21:47:34 +00:00
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1991-12-21 08:23:15 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:21:21 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
1993-03-22 03:27:18 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2005-03-01 09:08:47 +00:00
|
|
|
|
;; This is a major mode documented in the Emacs Lisp manual.
|
1993-03-22 03:27:18 +00:00
|
|
|
|
|
1992-07-16 21:47:34 +00:00
|
|
|
|
;;; Code:
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
2002-03-14 09:02:36 +00:00
|
|
|
|
(require 'button)
|
|
|
|
|
|
1998-04-05 18:26:32 +00:00
|
|
|
|
(defgroup debugger nil
|
|
|
|
|
"Debuggers and related commands for Emacs."
|
|
|
|
|
:prefix "debugger-"
|
|
|
|
|
:group 'debug)
|
1997-12-04 04:42:31 +00:00
|
|
|
|
|
1998-04-05 18:26:32 +00:00
|
|
|
|
(defcustom debugger-mode-hook nil
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"Hooks run when `debugger-mode' is turned on."
|
1998-04-05 18:26:32 +00:00
|
|
|
|
:type 'hook
|
1998-04-20 02:34:53 +00:00
|
|
|
|
:group 'debugger
|
|
|
|
|
:version "20.3")
|
1997-12-04 04:42:31 +00:00
|
|
|
|
|
1999-11-03 13:43:19 +00:00
|
|
|
|
(defcustom debugger-batch-max-lines 40
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"Maximum lines to show in debugger buffer in a noninteractive Emacs.
|
1999-11-03 13:43:19 +00:00
|
|
|
|
When the debugger is entered and Emacs is running in batch mode,
|
|
|
|
|
if the backtrace text has more than this many lines,
|
|
|
|
|
the middle is discarded, and just the beginning and end are displayed."
|
|
|
|
|
:type 'integer
|
|
|
|
|
:group 'debugger
|
|
|
|
|
:version "21.1")
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(defcustom debugger-bury-or-kill 'bury
|
2012-11-10 17:16:25 -08:00
|
|
|
|
"What to do with the debugger buffer when exiting `debug'.
|
|
|
|
|
The value affects the behavior of operations on any window
|
|
|
|
|
previously showing the debugger buffer.
|
2012-09-08 15:28:11 +02:00
|
|
|
|
|
|
|
|
|
`nil' means that if its window is not deleted when exiting the
|
|
|
|
|
debugger, invoking `switch-to-prev-buffer' will usually show
|
|
|
|
|
the debugger buffer again.
|
|
|
|
|
|
|
|
|
|
`append' means that if the window is not deleted, the debugger
|
|
|
|
|
buffer moves to the end of the window's previous buffers so
|
|
|
|
|
it's less likely that a future invocation of
|
|
|
|
|
`switch-to-prev-buffer' will switch to it. Also, it moves the
|
|
|
|
|
buffer to the end of the frame's buffer list.
|
|
|
|
|
|
|
|
|
|
`bury' means that if the window is not deleted, its buffer is
|
|
|
|
|
removed from the window's list of previous buffers. Also, it
|
|
|
|
|
moves the buffer to the end of the frame's buffer list. This
|
|
|
|
|
value provides the most reliable remedy to not have
|
|
|
|
|
`switch-to-prev-buffer' switch to the debugger buffer again
|
|
|
|
|
without killing the buffer.
|
|
|
|
|
|
|
|
|
|
`kill' means to kill the debugger buffer.
|
|
|
|
|
|
|
|
|
|
The value used here is passed to `quit-restore-window'."
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Keep alive" nil)
|
2012-09-18 09:07:13 +02:00
|
|
|
|
(const :tag "Append" append)
|
|
|
|
|
(const :tag "Bury" bury)
|
|
|
|
|
(const :tag "Kill" kill))
|
2012-09-08 15:28:11 +02:00
|
|
|
|
:group 'debugger
|
2012-11-10 16:40:37 -08:00
|
|
|
|
:version "24.3")
|
2012-09-08 15:28:11 +02:00
|
|
|
|
|
2005-03-04 14:48:14 +00:00
|
|
|
|
(defvar debugger-step-after-exit nil
|
|
|
|
|
"Non-nil means \"single-step\" after the debugger exits.")
|
1995-02-13 17:55:17 +00:00
|
|
|
|
|
|
|
|
|
(defvar debugger-value nil
|
|
|
|
|
"This is the value for the debugger to return, when it returns.")
|
|
|
|
|
|
|
|
|
|
(defvar debugger-old-buffer nil
|
|
|
|
|
"This is the buffer that was current when the debugger was entered.")
|
|
|
|
|
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(defvar debugger-previous-window nil
|
|
|
|
|
"This is the window last showing the debugger buffer.")
|
|
|
|
|
|
2012-09-12 17:49:17 +02:00
|
|
|
|
(defvar debugger-previous-window-height nil
|
|
|
|
|
"The last recorded height of `debugger-previous-window'.")
|
|
|
|
|
|
2001-12-16 03:48:41 +00:00
|
|
|
|
(defvar debugger-previous-backtrace nil
|
|
|
|
|
"The contents of the previous backtrace (including text properties).
|
|
|
|
|
This is to optimize `debugger-make-xrefs'.")
|
|
|
|
|
|
1994-04-16 07:18:26 +00:00
|
|
|
|
(defvar debugger-outer-match-data)
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(defvar debugger-will-be-back nil
|
|
|
|
|
"Non-nil if we expect to get back in the debugger soon.")
|
1994-01-09 23:11:56 +00:00
|
|
|
|
|
2005-03-03 16:25:13 +00:00
|
|
|
|
(defvar inhibit-debug-on-entry nil
|
|
|
|
|
"Non-nil means that debug-on-entry is disabled.")
|
|
|
|
|
|
|
|
|
|
(defvar debugger-jumping-flag nil
|
|
|
|
|
"Non-nil means that debug-on-entry is disabled.
|
2005-03-08 20:15:57 +00:00
|
|
|
|
This variable is used by `debugger-jump', `debugger-step-through',
|
|
|
|
|
and `debugger-reenable' to temporarily disable debug-on-entry.")
|
2005-02-28 14:33:50 +00:00
|
|
|
|
|
2005-06-08 19:35:54 +00:00
|
|
|
|
(defvar inhibit-trace) ;Not yet implemented.
|
2005-06-06 12:29:57 +00:00
|
|
|
|
|
2011-09-19 17:14:23 -04:00
|
|
|
|
(defvar debugger-args nil
|
|
|
|
|
"Arguments with which the debugger was called.
|
|
|
|
|
It is a list expected to take the form (CAUSE . REST)
|
|
|
|
|
where CAUSE can be:
|
|
|
|
|
- debug: called for entry to a flagged function.
|
|
|
|
|
- t: called because of debug-on-next-call.
|
|
|
|
|
- lambda: same thing but via `funcall'.
|
|
|
|
|
- exit: called because of exit of a flagged function.
|
|
|
|
|
- error: called because of `debug-on-error'.")
|
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(setq debugger 'debug)
|
|
|
|
|
;;;###autoload
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(defun debug (&rest args)
|
2011-07-14 22:16:55 -04:00
|
|
|
|
"Enter debugger. \\<debugger-mode-map>`\\[debugger-continue]' returns from the debugger.
|
1991-12-21 08:23:15 +00:00
|
|
|
|
Arguments are mainly for use when this is called from the internals
|
|
|
|
|
of the evaluator.
|
|
|
|
|
|
|
|
|
|
You may call with no args, or you may pass nil as the first arg and
|
|
|
|
|
any other args you like. In that case, the list of args after the
|
|
|
|
|
first will be printed into the backtrace buffer."
|
1995-03-20 05:09:18 +00:00
|
|
|
|
(interactive)
|
2002-07-29 01:49:45 +00:00
|
|
|
|
(if inhibit-redisplay
|
|
|
|
|
;; Don't really try to enter debugger within an eval from redisplay.
|
|
|
|
|
debugger-value
|
|
|
|
|
(unless noninteractive
|
|
|
|
|
(message "Entering debugger..."))
|
|
|
|
|
(let (debugger-value
|
2011-05-31 12:41:14 -03:00
|
|
|
|
(debugger-previous-state
|
|
|
|
|
(if (get-buffer "*Backtrace*")
|
|
|
|
|
(with-current-buffer (get-buffer "*Backtrace*")
|
|
|
|
|
(list major-mode (buffer-string)))))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(debugger-args args)
|
2009-08-28 16:29:25 +00:00
|
|
|
|
(debugger-buffer (get-buffer-create "*Backtrace*"))
|
2012-09-20 15:35:13 +02:00
|
|
|
|
(debugger-old-buffer (current-buffer))
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(debugger-window nil)
|
2002-07-29 01:49:45 +00:00
|
|
|
|
(debugger-step-after-exit nil)
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(debugger-will-be-back nil)
|
2002-07-29 01:49:45 +00:00
|
|
|
|
;; Don't keep reading from an executing kbd macro!
|
|
|
|
|
(executing-kbd-macro nil)
|
|
|
|
|
;; Save the outer values of these vars for the `e' command
|
|
|
|
|
;; before we replace the values.
|
|
|
|
|
(debugger-outer-match-data (match-data))
|
2005-07-10 17:19:07 +00:00
|
|
|
|
(debugger-with-timeout-suspend (with-timeout-suspend)))
|
2002-07-29 01:49:45 +00:00
|
|
|
|
;; Set this instead of binding it, so that `q'
|
|
|
|
|
;; will not restore it.
|
|
|
|
|
(setq overriding-terminal-local-map nil)
|
|
|
|
|
;; Don't let these magic variables affect the debugger itself.
|
|
|
|
|
(let ((last-command nil) this-command track-mouse
|
2005-02-28 14:33:50 +00:00
|
|
|
|
(inhibit-trace t)
|
|
|
|
|
(inhibit-debug-on-entry t)
|
2003-07-07 20:57:50 +00:00
|
|
|
|
unread-command-events
|
2002-07-29 01:49:45 +00:00
|
|
|
|
unread-post-input-method-events
|
|
|
|
|
last-input-event last-command-event last-nonmenu-event
|
|
|
|
|
last-event-frame
|
|
|
|
|
overriding-local-map
|
|
|
|
|
load-read-function
|
|
|
|
|
;; If we are inside a minibuffer, allow nesting
|
|
|
|
|
;; so that we don't get an error from the `e' command.
|
|
|
|
|
(enable-recursive-minibuffers
|
|
|
|
|
(or enable-recursive-minibuffers (> (minibuffer-depth) 0)))
|
|
|
|
|
(standard-input t) (standard-output t)
|
|
|
|
|
inhibit-redisplay
|
2012-10-13 09:58:53 +02:00
|
|
|
|
(cursor-in-echo-area nil)
|
|
|
|
|
(window-configuration (current-window-configuration)))
|
2002-07-29 01:49:45 +00:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(save-excursion
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(when (eq (car debugger-args) 'debug)
|
|
|
|
|
;; Skip the frames for backtrace-debug, byte-code,
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
;; debug--implement-debug-on-entry and the advice's `apply'.
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(backtrace-debug 4 t)
|
|
|
|
|
;; Place an extra debug-on-exit for macro's.
|
|
|
|
|
(when (eq 'lambda (car-safe (cadr (backtrace-frame 4))))
|
|
|
|
|
(backtrace-debug 5 t)))
|
|
|
|
|
(pop-to-buffer
|
|
|
|
|
debugger-buffer
|
|
|
|
|
`((display-buffer-reuse-window
|
|
|
|
|
display-buffer-in-previous-window)
|
|
|
|
|
. (,(when debugger-previous-window
|
|
|
|
|
`(previous-window . ,debugger-previous-window)))))
|
|
|
|
|
(setq debugger-window (selected-window))
|
2012-09-12 17:49:17 +02:00
|
|
|
|
(if (eq debugger-previous-window debugger-window)
|
|
|
|
|
(when debugger-jumping-flag
|
|
|
|
|
;; Try to restore previous height of debugger
|
|
|
|
|
;; window.
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(window-resize
|
|
|
|
|
debugger-window
|
|
|
|
|
(- debugger-previous-window-height
|
Support resizing frames and windows pixelwise.
* dispextern.h (enum window_part): Add ON_SCROLL_BAR,
ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
(struct glyph_matrix): Replace window_left_col and
window_top_line by window_pixel_left and window_pixel_top.
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
rewrite.
(enum face_id): Add WINDOW_DIVIDER_FACE_ID.
(draw_window_divider, move_it_to, x_draw_right_divider)
(x_draw_bottom_divider, change_frame_size): Add or fix
declarations.
* dispnew.c (change_frame_size_1): Change prototype.
(adjust_glyph_matrix, required_matrix_width)
(adjust_frame_glyphs_for_window_redisplay): Use pixel
values instead of lines and columns.
(marginal_area_string): Use WINDOW_FRINGES_WIDTH instead of
WINDOW_TOTAL_FRINGE_WIDTH.
(handle_window_change_signal, do_pending_window_change)
(init_display): Adjusts calls of change_frame_size.
(change_frame_size, change_frame_size_1): Handle pixelwise
changes.
* frame.c (Qright_divider_width, Qbottom_divider_width): New
Lisp objects.
(set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
(make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
(x_set_internal_border_width, x_set_vertical_scroll_bars)
(x_set_scroll_bar_width, x_figure_window_size): Handle pixel
values.
(set_frame_param): New function.
(Fframe_text_cols, Fframe_text_lines, Fframe_total_cols)
(Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
(Ffringe_width, Fborder_width, Fright_divider_width)
(Fbottom_divider_width): New functions, defsubr them.
(Fset_frame_height, Fset_frame_width, Fset_frame_size): New
argument pixelwise.
(struct frame_parm_table): New members Qright_divider_width and
Qbottom_divider_width.
(x_set_frame_parameters): Handle parameters for pixelwise sizes.
(x_report_frame_params): Handle Qright_divider_width and
Qbottom_divider_width.
(x_set_right_divider_width, x_set_bottom_divider_width): New
functions.
(frame_resize_pixelwise): New option.
* frame.h (struct frame): Add tool_bar_height, menu_bar_height,
new_pixelwise, right_divider_width and bottom_divider_width;
remove total_lines; rename text_lines, text_cols, new_text_lines
and new_text_cols to text_height, text_width, new_height and
new_width respectively.
(FRAME_LINES, FRAME_COLS): Rename to FRAME_TEXT_HEIGHT and
FRAME_TEXT_WIDTH respectively.
(FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
(FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
(FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
macros.
(FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
(SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
(FRAME_TOTAL_COLS_ARG): Remove macro.
* fringe.c (draw_fringe_bitmap_1): Handle right divder.
* gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
(x_wm_set_size_hint): Handle frame pixel sizes.
* indent.c (compute_motion, Fcompute_motion): Call
window_body_width instead of window_body_cols.
* keyboard.c (Qright_divider, Qbottom_divider): New symbols.
(make_lispy_position): Handle right and bottom dividers.
(Fsuspend_emacs): Pixelize call of change_frame_size.
* keyboard.h: Extern Qright_divider, Qbottom_divider.
* lisp.h: Extern set_frame_param.
* nsfns.m (x_set_tool_bar_lines): Pixelize call of
x_set_window_size.
(Fx_create_frame): Add entry for vertical_drag_cursor. Pixelize
call of change_frame_size.
* nsterm.h (struct ns_output): Add vertical_drag_cursor.
* nsterm.m (ns_update_window_end): Optionally draw right
divider.
(x_set_window_size): Add argument pixelwise. Call
check_frame_size and change_frame_size with pixelwise zero.
(ns_draw_window_divider): New function.
(ns_redisplay_interface): Add ns_draw_window_divider.
(updateFrameSize:): Call change_frame_size with pixelwise zero.
(x_new_font): Call x_set_window_size with pixelwise zero.
* print.c (print_object): For a window print its sequence
number again.
* term.c (Fresume_tty): Pixelize call of change_frame_size.
* w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(w32_createwindow): Use scroll bar area width.
(w32_wnd_proc): Handle bottom divider width. For
WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
(Fx_create_frame): Default divider width parameters. Caclulate
sizes pixelwise. Add vertical drag cursor support.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call to change_frame_size.
(Fx_show_tip): Add handling of divider widths. Pixelize window
position and sizes.
(Fw32_frame_rect): New function.
(frame_parm_handler w32_frame_parm_handlers): Add divider
widths.
(Vx_window_vertical_drag_shape): Add variable.
* w32inevt.c (resize_event, maybe_generate_resize_event):
Pixelize change_frame_size calls.
* w32menu.c (set_frame_menubar): Pixelize x_set_window_size
call.
* w32term.c (w32_draw_window_divider): New function.
(x_update_window_end): Handle right divider.
(w32_draw_fringe_bitmap, x_scroll_run)
(w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
(w32_read_socket): Handle SIZE_MAXIMIZED separately. Calculate
new frame sizes pixelwise.
(x_new_font): Pixelize call to x_set_window_size.
(x_check_fullscreen): Pixelize call to change_frame_size.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Use scroll bar area width.
(w32_redisplay_interface): Add w32_draw_window_divider.
* w32term.h (struct w32_output): Add vertical drag cursor.
* widget.c (set_frame_size, update_wm_hints)
(EmacsFrameResize, EmacsFrameSetValues): Pixelize calls of
change_frame_size.
(EmacsFrameSetCharSize): Pixelize call of x_set_window_size.
* window.c (sequence_number): Restore.
(Fwindow_pixel_width, Fwindow_pixel_height)
(Fwindow_mode_line_height, Fwindow_header_line_height)
(window_pixel_to_total, Frun_window_scroll_functions)
(Fset_window_new_pixel, window_resize_apply_total)
(Fwindow_resize_apply_total): New functions.
(window_body_height, window_body_width): Rename from
window_body_lines. New argument PIXELWISE. Calculate
pixelwise.
(Fwindow_body_height, Fwindow_body_width): New argument
PIXELWISE.
(coordinates_in_window, window_relative_x_coord): Use window's
pixel width instead of total width.
(replace_window, recombine_windows): Initialize pixel values.
(resize_root_window, resize_frame_windows, grow_mini_window)
(shrink_mini_window): New argument PIXELWISE. Calculate
pixelwise.
(Fdelete_other_windows_internal, adjust_window_margins)
(window_resize_check, window_resize_apply)
(Fdelete_window_internal, Fresize_mini_window_internal)
(Fwindow_text_width, Fwindow_text_height): Calculate pixelwise.
(check_frame_size): Rename arguments. New argument PIXELWISE.
Calculate pixelwise.
(set_window_buffer): Make samebuf bool. Run configuration change
hook only if buffer changed.
(Fset_window_buffer): Rewrite doc-string.
(make_window): Initialize new_pixel slot.
(Fwindow_resize_apply): Check pixel size of root window.
(Fsplit_window_internal): Call 2nd argument pixel_size.
Calculate pixelwise.
(Fscroll_left, Fscroll_right): Call window_body_width instead of
window_body_cols.
(save_window_data): New slots frame_text_width,
frame_text_height, frame_menu_bar_height, frame_tool_bar_height.
(saved_window): New slots pixel_left, pixel_top, pixel_height,
pixel_width.
(Fcurrent_window_configuration, Fset_window_configuration)
(save_window_save, compare_window_configurations): Handle new
slots in save_window_data and saved_window.
(Fset_window_scroll_bars): Fix doc-string.
(window_resize_pixelwise): New variable.
(coordinates_in_window, Fcoordinates_in_window_p): Handle
dividers.
(make_parent_window): Adjust sequence_number.
(Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
functions.
* window.h (struct window): New members new_pixel, pixel_left,
pixel_top, pixel_width, pixel_height. Restore sequence_number.
(wset_new_pixel): New function.
(WINDOW_PIXEL_WIDTH, WINDOW_PIXEL_HEIGHT)
(MIN_SAFE_WINDOW_PIXEL_WIDTH, MIN_SAFE_WINDOW_PIXEL_HEIGHT)
(WINDOW_LEFT_PIXEL_EDGE, WINDOW_RIGHT_PIXEL_EDGE)
(WINDOW_TOP_PIXEL_EDGE, WINDOW_BOTTOM_PIXEL_EDGE)
(WINDOW_BOTTOMMOST_P, WINDOW_BOX_LEFT_PIXEL_EDGE)
(WINDOW_BOX_RIGHT_PIXEL_EDGE, WINDOW_MARGINS_COLS)
(WINDOW_MARGINS_WIDTH, WINDOW_RIGHT_DIVIDER_WIDTH)
(WINDOW_BOTTOM_DIVIDER_WIDTH): New macros.
(WINDOW_TOTAL_FRINGE_WIDTH): Rename to WINDOW_FRINGES_WIDTH.
(WINDOW_TOTAL_WIDTH, WINDOW_TOTAL_HEIGHT): Remove macros.
(WINDOW_RIGHT_EDGE_X, WINDOW_LEFT_EDGE_X, WINDOW_TOP_EDGE_Y)
(WINDOW_BOTTOM_EDGE_Y, WINDOW_FULL_WIDTH_P, WINDOW_LEFTMOST_P)
(WINDOW_RIGHTMOST_P, WINDOW_BOX_LEFT_EDGE_X)
(WINDOW_BOX_RIGHT_EDGE_X, WINDOW_FRINGE_COLS)
(WINDOW_BOX_HEIGHT_NO_MODE_LINE, WINDOW_BOX_TEXT_HEIGHT):
Rewrite.
(resize_frame_windows, grow_mini_window, shrink_mini_window)
(window_body_width, check_frame_size): Adapt external declarations.
* xdisp.c (last_max_ascent): New integer.
(window_text_bottom_y): Handle bottom divider.
(window_box_width, window_box_height): Calculate pixelwise.
(get_glyph_string_clip_rects): Handle right divider.
(remember_mouse_glyph): When windows are resized pixelwise
proceed with width and height set to 1.
(init_iterator): Use WINDOW_PIXEL_WIDTH instead of
WINDOW_TOTAL_WIDTH.
(move_it_to): Calculate and return maximum x position
encountered.
(Fwindow_text_pixel_size): New function.
(resize_mini_window, update_tool_bar): Calculate pixelwise.
(tool_bar_lines_needed): Rename to tool_bar_height. Calculate
pixelwise.
(Ftool_bar_lines_needed): Rename to Ftool_bar_height. Calculate
pixelwise.
(redisplay_tool_bar): Calculate pixelwise.
(redisplay_window): Calculate pixelwise. Handle dividers.
(draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
(x_draw_vertical_border): Handle dividers.
(define_frame_cursor1): Handle vertical drag cursor.
(x_draw_right_divider, x_draw_bottom_divider): New functions.
(expose_window): Calculate pixelwise. Handle dividers.
(init_xdisp): Initialize pixel values.
* xfaces.c (Qwindow_divider): New face.
(realize_basic_faces): Realize it.
* xfns.c (x_set_mouse_color): Handle vertical_drag_cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(x_set_scroll_bar_default_width): Default actual width to 16.
(Fx_create_frame): Set sizes pixelwise.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call of change_frame_size.
(Fx_show_tip): Handle divider widths. Initial pixel position
and sizes.
(frame_parm_handler x_frame_parm_handlers): Add divider widths.
(Vx_window_vertical_drag_shape): New option.
* xmenu.c (free_frame_menubar): Pixelize call of
x_set_window_size.
* xterm.c (x_draw_window_divider): New function.
(x_update_window_end): Optionally draw right divider.
(x_draw_fringe_bitmap, x_scroll_run, x_scroll_bar_create)
(XTset_vertical_scroll_bar): Use scroll bar pixel width.
(handle_one_xevent, x_new_font): Calculate pixelwise.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Pixelize call of check_frame_size.
(struct x_redisplay_interface): Add x_draw_window_divider.
* xterm.h (struct x_output): Add vertical_drag_cursor.
* cus-start.el (frame-resize-pixelwise)
(window-resize-pixelwise): New entries.
* emacs-lisp/debug.el (debug): Use window-total-height instead
of window-total-size.
* frame.el (tool-bar-lines-needed): Defalias to tool-bar-height.
* help.el (describe-bindings-internal): Call help-buffer
(temp-buffer-max-width): New option.
(resize-temp-buffer-window, help-window-setup)
(with-help-window): Rewrite.
* mouse.el (mouse-drag-line): Rewrite. Add key bindings for
dragging dividers.
* window.el (frame-char-size, window-min-pixel-height)
(window-safe-min-pixel-height, window-safe-min-pixel-width)
(window-min-pixel-width, window-safe-min-pixel-size)
(window-combination-p, window-safe-min-size)
(window-resizable-p, window--size-to-pixel)
(window--pixel-to-size, window--resize-apply-p): New functions.
(window-safe-min-height): Fix doc-string.
(window-size, window-min-size, window--min-size-1)
(window-sizable, window-sizable-p, window--min-delta-1)
(window-min-delta, window--max-delta-1, window-max-delta)
(window--resizable, window--resizable-p, window-resizable)
(window-full-height-p, window-full-width-p, window-at-side-p)
(window--in-direction-2, window-in-direction)
(window--resize-reset-1, window--resize-mini-window)
(window-resize, window-resize-no-error)
(window--resize-child-windows-normal)
(window--resize-child-windows, window--resize-siblings)
(window--resize-this-window, window--resize-root-window)
(window--resize-root-window-vertically)
(adjust-window-trailing-edge, enlarge-window, shrink-window)
(maximize-window, minimize-window, delete-window)
(quit-restore-window, window-split-min-size, split-window)
(balance-windows-2, balance-windows)
(balance-windows-area-adjust, balance-windows-area)
(window--state-get-1, window-state-get, window--state-put-1)
(window--state-put-2, window-state-put)
(display-buffer-record-window, window--display-buffer): Make
functions handle pixelwise sizing of windows.
(display-buffer--action-function-custom-type)
(display-buffer-fallback-action): Add
display-buffer-in-previous-window.
(display-buffer-use-some-window): Resize window to height it had
before.
(fit-window-to-buffer-horizontally): New option.
(fit-frame-to-buffer): Describe new values.
(fit-frame-to-buffer-bottom-margin): Replace with
fit-frame-to-buffer-margins.
(window--sanitize-margin): New function.
(fit-frame-to-buffer, fit-window-to-buffer): Rewrite completely
using window-text-pixel-size.
2013-11-30 10:25:31 +01:00
|
|
|
|
(window-total-height debugger-window)))
|
2012-09-12 17:49:17 +02:00
|
|
|
|
(error nil)))
|
|
|
|
|
(setq debugger-previous-window debugger-window))
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(debugger-mode)
|
|
|
|
|
(debugger-setup-buffer debugger-args)
|
|
|
|
|
(when noninteractive
|
|
|
|
|
;; If the backtrace is long, save the beginning
|
|
|
|
|
;; and the end, but discard the middle.
|
|
|
|
|
(when (> (count-lines (point-min) (point-max))
|
|
|
|
|
debugger-batch-max-lines)
|
1999-11-03 13:43:19 +00:00
|
|
|
|
(goto-char (point-min))
|
2012-09-08 15:28:11 +02:00
|
|
|
|
(forward-line (/ 2 debugger-batch-max-lines))
|
|
|
|
|
(let ((middlestart (point)))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(forward-line (- (/ 2 debugger-batch-max-lines)
|
|
|
|
|
debugger-batch-max-lines))
|
|
|
|
|
(delete-region middlestart (point)))
|
|
|
|
|
(insert "...\n"))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(message "%s" (buffer-string))
|
|
|
|
|
(kill-emacs -1))
|
|
|
|
|
(message "")
|
|
|
|
|
(let ((standard-output nil)
|
|
|
|
|
(buffer-read-only t))
|
1994-01-09 23:11:56 +00:00
|
|
|
|
(message "")
|
2012-09-08 15:28:11 +02:00
|
|
|
|
;; Make sure we unbind buffer-read-only in the right buffer.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(recursive-edit))))
|
2012-10-19 11:28:50 +02:00
|
|
|
|
(when (and (window-live-p debugger-window)
|
|
|
|
|
(eq (window-buffer debugger-window) debugger-buffer))
|
|
|
|
|
;; Record height of debugger window.
|
|
|
|
|
(setq debugger-previous-window-height
|
Support resizing frames and windows pixelwise.
* dispextern.h (enum window_part): Add ON_SCROLL_BAR,
ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
(struct glyph_matrix): Replace window_left_col and
window_top_line by window_pixel_left and window_pixel_top.
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
rewrite.
(enum face_id): Add WINDOW_DIVIDER_FACE_ID.
(draw_window_divider, move_it_to, x_draw_right_divider)
(x_draw_bottom_divider, change_frame_size): Add or fix
declarations.
* dispnew.c (change_frame_size_1): Change prototype.
(adjust_glyph_matrix, required_matrix_width)
(adjust_frame_glyphs_for_window_redisplay): Use pixel
values instead of lines and columns.
(marginal_area_string): Use WINDOW_FRINGES_WIDTH instead of
WINDOW_TOTAL_FRINGE_WIDTH.
(handle_window_change_signal, do_pending_window_change)
(init_display): Adjusts calls of change_frame_size.
(change_frame_size, change_frame_size_1): Handle pixelwise
changes.
* frame.c (Qright_divider_width, Qbottom_divider_width): New
Lisp objects.
(set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
(make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
(x_set_internal_border_width, x_set_vertical_scroll_bars)
(x_set_scroll_bar_width, x_figure_window_size): Handle pixel
values.
(set_frame_param): New function.
(Fframe_text_cols, Fframe_text_lines, Fframe_total_cols)
(Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
(Ffringe_width, Fborder_width, Fright_divider_width)
(Fbottom_divider_width): New functions, defsubr them.
(Fset_frame_height, Fset_frame_width, Fset_frame_size): New
argument pixelwise.
(struct frame_parm_table): New members Qright_divider_width and
Qbottom_divider_width.
(x_set_frame_parameters): Handle parameters for pixelwise sizes.
(x_report_frame_params): Handle Qright_divider_width and
Qbottom_divider_width.
(x_set_right_divider_width, x_set_bottom_divider_width): New
functions.
(frame_resize_pixelwise): New option.
* frame.h (struct frame): Add tool_bar_height, menu_bar_height,
new_pixelwise, right_divider_width and bottom_divider_width;
remove total_lines; rename text_lines, text_cols, new_text_lines
and new_text_cols to text_height, text_width, new_height and
new_width respectively.
(FRAME_LINES, FRAME_COLS): Rename to FRAME_TEXT_HEIGHT and
FRAME_TEXT_WIDTH respectively.
(FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
(FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
(FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
macros.
(FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
(SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
(FRAME_TOTAL_COLS_ARG): Remove macro.
* fringe.c (draw_fringe_bitmap_1): Handle right divder.
* gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
(x_wm_set_size_hint): Handle frame pixel sizes.
* indent.c (compute_motion, Fcompute_motion): Call
window_body_width instead of window_body_cols.
* keyboard.c (Qright_divider, Qbottom_divider): New symbols.
(make_lispy_position): Handle right and bottom dividers.
(Fsuspend_emacs): Pixelize call of change_frame_size.
* keyboard.h: Extern Qright_divider, Qbottom_divider.
* lisp.h: Extern set_frame_param.
* nsfns.m (x_set_tool_bar_lines): Pixelize call of
x_set_window_size.
(Fx_create_frame): Add entry for vertical_drag_cursor. Pixelize
call of change_frame_size.
* nsterm.h (struct ns_output): Add vertical_drag_cursor.
* nsterm.m (ns_update_window_end): Optionally draw right
divider.
(x_set_window_size): Add argument pixelwise. Call
check_frame_size and change_frame_size with pixelwise zero.
(ns_draw_window_divider): New function.
(ns_redisplay_interface): Add ns_draw_window_divider.
(updateFrameSize:): Call change_frame_size with pixelwise zero.
(x_new_font): Call x_set_window_size with pixelwise zero.
* print.c (print_object): For a window print its sequence
number again.
* term.c (Fresume_tty): Pixelize call of change_frame_size.
* w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(w32_createwindow): Use scroll bar area width.
(w32_wnd_proc): Handle bottom divider width. For
WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
(Fx_create_frame): Default divider width parameters. Caclulate
sizes pixelwise. Add vertical drag cursor support.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call to change_frame_size.
(Fx_show_tip): Add handling of divider widths. Pixelize window
position and sizes.
(Fw32_frame_rect): New function.
(frame_parm_handler w32_frame_parm_handlers): Add divider
widths.
(Vx_window_vertical_drag_shape): Add variable.
* w32inevt.c (resize_event, maybe_generate_resize_event):
Pixelize change_frame_size calls.
* w32menu.c (set_frame_menubar): Pixelize x_set_window_size
call.
* w32term.c (w32_draw_window_divider): New function.
(x_update_window_end): Handle right divider.
(w32_draw_fringe_bitmap, x_scroll_run)
(w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
(w32_read_socket): Handle SIZE_MAXIMIZED separately. Calculate
new frame sizes pixelwise.
(x_new_font): Pixelize call to x_set_window_size.
(x_check_fullscreen): Pixelize call to change_frame_size.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Use scroll bar area width.
(w32_redisplay_interface): Add w32_draw_window_divider.
* w32term.h (struct w32_output): Add vertical drag cursor.
* widget.c (set_frame_size, update_wm_hints)
(EmacsFrameResize, EmacsFrameSetValues): Pixelize calls of
change_frame_size.
(EmacsFrameSetCharSize): Pixelize call of x_set_window_size.
* window.c (sequence_number): Restore.
(Fwindow_pixel_width, Fwindow_pixel_height)
(Fwindow_mode_line_height, Fwindow_header_line_height)
(window_pixel_to_total, Frun_window_scroll_functions)
(Fset_window_new_pixel, window_resize_apply_total)
(Fwindow_resize_apply_total): New functions.
(window_body_height, window_body_width): Rename from
window_body_lines. New argument PIXELWISE. Calculate
pixelwise.
(Fwindow_body_height, Fwindow_body_width): New argument
PIXELWISE.
(coordinates_in_window, window_relative_x_coord): Use window's
pixel width instead of total width.
(replace_window, recombine_windows): Initialize pixel values.
(resize_root_window, resize_frame_windows, grow_mini_window)
(shrink_mini_window): New argument PIXELWISE. Calculate
pixelwise.
(Fdelete_other_windows_internal, adjust_window_margins)
(window_resize_check, window_resize_apply)
(Fdelete_window_internal, Fresize_mini_window_internal)
(Fwindow_text_width, Fwindow_text_height): Calculate pixelwise.
(check_frame_size): Rename arguments. New argument PIXELWISE.
Calculate pixelwise.
(set_window_buffer): Make samebuf bool. Run configuration change
hook only if buffer changed.
(Fset_window_buffer): Rewrite doc-string.
(make_window): Initialize new_pixel slot.
(Fwindow_resize_apply): Check pixel size of root window.
(Fsplit_window_internal): Call 2nd argument pixel_size.
Calculate pixelwise.
(Fscroll_left, Fscroll_right): Call window_body_width instead of
window_body_cols.
(save_window_data): New slots frame_text_width,
frame_text_height, frame_menu_bar_height, frame_tool_bar_height.
(saved_window): New slots pixel_left, pixel_top, pixel_height,
pixel_width.
(Fcurrent_window_configuration, Fset_window_configuration)
(save_window_save, compare_window_configurations): Handle new
slots in save_window_data and saved_window.
(Fset_window_scroll_bars): Fix doc-string.
(window_resize_pixelwise): New variable.
(coordinates_in_window, Fcoordinates_in_window_p): Handle
dividers.
(make_parent_window): Adjust sequence_number.
(Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
functions.
* window.h (struct window): New members new_pixel, pixel_left,
pixel_top, pixel_width, pixel_height. Restore sequence_number.
(wset_new_pixel): New function.
(WINDOW_PIXEL_WIDTH, WINDOW_PIXEL_HEIGHT)
(MIN_SAFE_WINDOW_PIXEL_WIDTH, MIN_SAFE_WINDOW_PIXEL_HEIGHT)
(WINDOW_LEFT_PIXEL_EDGE, WINDOW_RIGHT_PIXEL_EDGE)
(WINDOW_TOP_PIXEL_EDGE, WINDOW_BOTTOM_PIXEL_EDGE)
(WINDOW_BOTTOMMOST_P, WINDOW_BOX_LEFT_PIXEL_EDGE)
(WINDOW_BOX_RIGHT_PIXEL_EDGE, WINDOW_MARGINS_COLS)
(WINDOW_MARGINS_WIDTH, WINDOW_RIGHT_DIVIDER_WIDTH)
(WINDOW_BOTTOM_DIVIDER_WIDTH): New macros.
(WINDOW_TOTAL_FRINGE_WIDTH): Rename to WINDOW_FRINGES_WIDTH.
(WINDOW_TOTAL_WIDTH, WINDOW_TOTAL_HEIGHT): Remove macros.
(WINDOW_RIGHT_EDGE_X, WINDOW_LEFT_EDGE_X, WINDOW_TOP_EDGE_Y)
(WINDOW_BOTTOM_EDGE_Y, WINDOW_FULL_WIDTH_P, WINDOW_LEFTMOST_P)
(WINDOW_RIGHTMOST_P, WINDOW_BOX_LEFT_EDGE_X)
(WINDOW_BOX_RIGHT_EDGE_X, WINDOW_FRINGE_COLS)
(WINDOW_BOX_HEIGHT_NO_MODE_LINE, WINDOW_BOX_TEXT_HEIGHT):
Rewrite.
(resize_frame_windows, grow_mini_window, shrink_mini_window)
(window_body_width, check_frame_size): Adapt external declarations.
* xdisp.c (last_max_ascent): New integer.
(window_text_bottom_y): Handle bottom divider.
(window_box_width, window_box_height): Calculate pixelwise.
(get_glyph_string_clip_rects): Handle right divider.
(remember_mouse_glyph): When windows are resized pixelwise
proceed with width and height set to 1.
(init_iterator): Use WINDOW_PIXEL_WIDTH instead of
WINDOW_TOTAL_WIDTH.
(move_it_to): Calculate and return maximum x position
encountered.
(Fwindow_text_pixel_size): New function.
(resize_mini_window, update_tool_bar): Calculate pixelwise.
(tool_bar_lines_needed): Rename to tool_bar_height. Calculate
pixelwise.
(Ftool_bar_lines_needed): Rename to Ftool_bar_height. Calculate
pixelwise.
(redisplay_tool_bar): Calculate pixelwise.
(redisplay_window): Calculate pixelwise. Handle dividers.
(draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
(x_draw_vertical_border): Handle dividers.
(define_frame_cursor1): Handle vertical drag cursor.
(x_draw_right_divider, x_draw_bottom_divider): New functions.
(expose_window): Calculate pixelwise. Handle dividers.
(init_xdisp): Initialize pixel values.
* xfaces.c (Qwindow_divider): New face.
(realize_basic_faces): Realize it.
* xfns.c (x_set_mouse_color): Handle vertical_drag_cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(x_set_scroll_bar_default_width): Default actual width to 16.
(Fx_create_frame): Set sizes pixelwise.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call of change_frame_size.
(Fx_show_tip): Handle divider widths. Initial pixel position
and sizes.
(frame_parm_handler x_frame_parm_handlers): Add divider widths.
(Vx_window_vertical_drag_shape): New option.
* xmenu.c (free_frame_menubar): Pixelize call of
x_set_window_size.
* xterm.c (x_draw_window_divider): New function.
(x_update_window_end): Optionally draw right divider.
(x_draw_fringe_bitmap, x_scroll_run, x_scroll_bar_create)
(XTset_vertical_scroll_bar): Use scroll bar pixel width.
(handle_one_xevent, x_new_font): Calculate pixelwise.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Pixelize call of check_frame_size.
(struct x_redisplay_interface): Add x_draw_window_divider.
* xterm.h (struct x_output): Add vertical_drag_cursor.
* cus-start.el (frame-resize-pixelwise)
(window-resize-pixelwise): New entries.
* emacs-lisp/debug.el (debug): Use window-total-height instead
of window-total-size.
* frame.el (tool-bar-lines-needed): Defalias to tool-bar-height.
* help.el (describe-bindings-internal): Call help-buffer
(temp-buffer-max-width): New option.
(resize-temp-buffer-window, help-window-setup)
(with-help-window): Rewrite.
* mouse.el (mouse-drag-line): Rewrite. Add key bindings for
dragging dividers.
* window.el (frame-char-size, window-min-pixel-height)
(window-safe-min-pixel-height, window-safe-min-pixel-width)
(window-min-pixel-width, window-safe-min-pixel-size)
(window-combination-p, window-safe-min-size)
(window-resizable-p, window--size-to-pixel)
(window--pixel-to-size, window--resize-apply-p): New functions.
(window-safe-min-height): Fix doc-string.
(window-size, window-min-size, window--min-size-1)
(window-sizable, window-sizable-p, window--min-delta-1)
(window-min-delta, window--max-delta-1, window-max-delta)
(window--resizable, window--resizable-p, window-resizable)
(window-full-height-p, window-full-width-p, window-at-side-p)
(window--in-direction-2, window-in-direction)
(window--resize-reset-1, window--resize-mini-window)
(window-resize, window-resize-no-error)
(window--resize-child-windows-normal)
(window--resize-child-windows, window--resize-siblings)
(window--resize-this-window, window--resize-root-window)
(window--resize-root-window-vertically)
(adjust-window-trailing-edge, enlarge-window, shrink-window)
(maximize-window, minimize-window, delete-window)
(quit-restore-window, window-split-min-size, split-window)
(balance-windows-2, balance-windows)
(balance-windows-area-adjust, balance-windows-area)
(window--state-get-1, window-state-get, window--state-put-1)
(window--state-put-2, window-state-put)
(display-buffer-record-window, window--display-buffer): Make
functions handle pixelwise sizing of windows.
(display-buffer--action-function-custom-type)
(display-buffer-fallback-action): Add
display-buffer-in-previous-window.
(display-buffer-use-some-window): Resize window to height it had
before.
(fit-window-to-buffer-horizontally): New option.
(fit-frame-to-buffer): Describe new values.
(fit-frame-to-buffer-bottom-margin): Replace with
fit-frame-to-buffer-margins.
(window--sanitize-margin): New function.
(fit-frame-to-buffer, fit-window-to-buffer): Rewrite completely
using window-text-pixel-size.
2013-11-30 10:25:31 +01:00
|
|
|
|
(window-total-height debugger-window)))
|
2012-10-13 09:58:53 +02:00
|
|
|
|
(if debugger-will-be-back
|
|
|
|
|
;; Restore previous window configuration (Bug#12623).
|
|
|
|
|
(set-window-configuration window-configuration)
|
|
|
|
|
(when (and (window-live-p debugger-window)
|
|
|
|
|
(eq (window-buffer debugger-window) debugger-buffer))
|
|
|
|
|
(progn
|
|
|
|
|
;; Unshow debugger-buffer.
|
|
|
|
|
(quit-restore-window debugger-window debugger-bury-or-kill)
|
|
|
|
|
;; Restore current buffer (Bug#12502).
|
|
|
|
|
(set-buffer debugger-old-buffer))))
|
2012-09-08 15:28:11 +02:00
|
|
|
|
;; Restore previous state of debugger-buffer in case we were
|
|
|
|
|
;; in a recursive invocation of the debugger, otherwise just
|
|
|
|
|
;; erase the buffer and put it into fundamental mode.
|
|
|
|
|
(when (buffer-live-p debugger-buffer)
|
|
|
|
|
(with-current-buffer debugger-buffer
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(if (null debugger-previous-state)
|
|
|
|
|
(fundamental-mode)
|
|
|
|
|
(insert (nth 1 debugger-previous-state))
|
|
|
|
|
(funcall (nth 0 debugger-previous-state))))))
|
2005-07-10 17:19:07 +00:00
|
|
|
|
(with-timeout-unsuspend debugger-with-timeout-suspend)
|
2002-07-29 01:49:45 +00:00
|
|
|
|
(set-match-data debugger-outer-match-data)))
|
|
|
|
|
(setq debug-on-next-call debugger-step-after-exit)
|
|
|
|
|
debugger-value)))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(defun debugger-setup-buffer (args)
|
1999-11-03 13:43:19 +00:00
|
|
|
|
"Initialize the `*Backtrace*' buffer for entry to the debugger.
|
|
|
|
|
That buffer should be current already."
|
|
|
|
|
(setq buffer-read-only nil)
|
|
|
|
|
(erase-buffer)
|
2009-08-30 14:19:25 +00:00
|
|
|
|
(set-buffer-multibyte t) ;Why was it nil ? -stef
|
2007-10-10 20:19:44 +00:00
|
|
|
|
(setq buffer-undo-list t)
|
1999-11-03 13:43:19 +00:00
|
|
|
|
(let ((standard-output (current-buffer))
|
|
|
|
|
(print-escape-newlines t)
|
|
|
|
|
(print-level 8)
|
|
|
|
|
(print-length 50))
|
|
|
|
|
(backtrace))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(delete-region (point)
|
|
|
|
|
(progn
|
|
|
|
|
(search-forward "\n debug(")
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(forward-line (if (eq (car args) 'debug)
|
|
|
|
|
;; Remove debug--implement-debug-on-entry
|
|
|
|
|
;; and the advice's `apply' frame.
|
|
|
|
|
3
|
2005-03-01 13:02:37 +00:00
|
|
|
|
1))
|
1999-11-03 13:43:19 +00:00
|
|
|
|
(point)))
|
|
|
|
|
(insert "Debugger entered")
|
|
|
|
|
;; lambda is for debug-on-call when a function call is next.
|
|
|
|
|
;; debug is for debug-on-entry function called.
|
2013-08-15 13:21:19 -04:00
|
|
|
|
(let ((pos (point)))
|
|
|
|
|
(pcase (car args)
|
|
|
|
|
((or `lambda `debug)
|
|
|
|
|
(insert "--entering a function:\n")
|
|
|
|
|
(setq pos (1- (point))))
|
|
|
|
|
;; Exiting a function.
|
|
|
|
|
(`exit
|
|
|
|
|
(insert "--returning value: ")
|
|
|
|
|
(setq pos (point))
|
|
|
|
|
(setq debugger-value (nth 1 args))
|
|
|
|
|
(prin1 debugger-value (current-buffer))
|
|
|
|
|
(insert ?\n)
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
(insert ? )
|
|
|
|
|
(beginning-of-line))
|
|
|
|
|
;; Debugger entered for an error.
|
|
|
|
|
(`error
|
|
|
|
|
(insert "--Lisp error: ")
|
|
|
|
|
(setq pos (point))
|
|
|
|
|
(prin1 (nth 1 args) (current-buffer))
|
|
|
|
|
(insert ?\n))
|
|
|
|
|
;; debug-on-call, when the next thing is an eval.
|
|
|
|
|
(`t
|
|
|
|
|
(insert "--beginning evaluation of function call form:\n")
|
|
|
|
|
(setq pos (1- (point))))
|
|
|
|
|
;; User calls debug directly.
|
|
|
|
|
(_
|
|
|
|
|
(insert ": ")
|
|
|
|
|
(setq pos (point))
|
|
|
|
|
(prin1 (if (eq (car args) 'nil)
|
|
|
|
|
(cdr args) args)
|
|
|
|
|
(current-buffer))
|
|
|
|
|
(insert ?\n)))
|
|
|
|
|
;; Place point on "stack frame 0" (bug#15101).
|
|
|
|
|
(goto-char pos))
|
2002-02-06 15:36:41 +00:00
|
|
|
|
;; After any frame that uses eval-buffer,
|
|
|
|
|
;; insert a line that states the buffer position it's reading at.
|
|
|
|
|
(save-excursion
|
2005-07-10 17:06:33 +00:00
|
|
|
|
(let ((tem eval-buffer-list))
|
|
|
|
|
(while (and tem
|
|
|
|
|
(re-search-forward "^ eval-\\(buffer\\|region\\)(" nil t))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(insert (format " ; Reading at buffer position %d"
|
|
|
|
|
;; This will get the wrong result
|
|
|
|
|
;; if there are two nested eval-region calls
|
|
|
|
|
;; for the same buffer. That's not a very useful case.
|
|
|
|
|
(with-current-buffer (car tem)
|
|
|
|
|
(point))))
|
|
|
|
|
(pop tem))))
|
2001-10-31 19:32:26 +00:00
|
|
|
|
(debugger-make-xrefs))
|
|
|
|
|
|
|
|
|
|
(defun debugger-make-xrefs (&optional buffer)
|
2005-03-14 17:46:09 +00:00
|
|
|
|
"Attach cross-references to function names in the `*Backtrace*' buffer."
|
2001-10-31 19:32:26 +00:00
|
|
|
|
(interactive "b")
|
* textmodes/two-column.el (2C-split):
* textmodes/texnfo-upd.el (texinfo-multi-file-included-list):
* textmodes/tex-mode.el (tex-set-buffer-directory):
* textmodes/spell.el (spell-region, spell-string):
* textmodes/reftex.el (reftex-erase-buffer):
(reftex-get-file-buffer-force, reftex-kill-temporary-buffers):
* textmodes/reftex-toc.el (reftex-toc-promote-action):
* textmodes/reftex-sel.el (reftex-get-offset, reftex-insert-docstruct)
(reftex-select-item):
* textmodes/reftex-ref.el (reftex-label-info-update)
(reftex-offer-label-menu):
* textmodes/reftex-index.el (reftex-index-change-entry)
(reftex-index-phrases-info):
* textmodes/reftex-global.el (reftex-create-tags-file)
(reftex-save-all-document-buffers, reftex-ensure-write-access):
* textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite)
(reftex-view-crossref-from-bibtex):
* textmodes/reftex-cite.el (reftex-bibtex-selection-callback)
(reftex-extract-bib-entries-from-thebibliography)
(reftex-all-used-citation-keys, reftex-create-bibtex-file):
* textmodes/refbib.el (r2b-capitalize-title):
(r2b-convert-buffer, r2b-help):
* textmodes/page-ext.el (pages-directory)
(pages-directory-goto-with-mouse):
* textmodes/bibtex.el (bibtex-validate-globally):
* textmodes/bib-mode.el (bib-capitalize-title):
* textmodes/artist.el (artist-clear-buffer, artist-system):
* progmodes/xscheme.el (global-set-scheme-interaction-buffer):
(local-set-scheme-interaction-buffer, xscheme-process-filter)
(verify-xscheme-buffer, xscheme-enter-interaction-mode)
(xscheme-enter-debugger-mode, xscheme-debugger-mode-p)
(xscheme-send-control-g-interrupt, xscheme-start-process)
(xscheme-process-sentinel, xscheme-cd):
* progmodes/verilog-mode.el (verilog-read-always-signals)
(verilog-set-define, verilog-getopt-file)
(verilog-module-inside-filename-p):
* progmodes/sh-script.el:
* progmodes/python.el (python-pdbtrack-get-source-buffer)
(python-pdbtrack-grub-for-buffer, python-execute-file):
* progmodes/octave-inf.el (inferior-octave):
* progmodes/idlwave.el (idlwave-scan-user-lib-files)
(idlwave-shell-compile-helper-routines, idlwave-set-local)
(idlwave-display-completion-list-xemacs, idlwave-list-abbrevs)
(idlwave-display-completion-list-emacs, idlwave-list-load-path-shadows)
(idlwave-completion-fontify-classes, idlwave-display-calling-sequence):
* progmodes/idlw-shell.el (idlwave-shell-examine-display-clear)
(idlwave-shell-filter, idlwave-shell-examine-highlight)
(idlwave-shell-sentinel, idlwave-shell-filter-directory)
(idlwave-shell-display-line, idlwave-shell-set-bp-in-module)
(idlwave-shell-examine-display, idlwave-shell-run-region)
(idlwave-shell-filter-bp, idlwave-shell-save-and-action)
(idlwave-shell-sources-filter, idlwave-shell-goto-next-error):
* progmodes/idlw-help.el (idlwave-help-get-special-help)
(idlwave-help-get-help-buffer):
* progmodes/gud.el (gud-basic-call, gud-find-class)
(gud-tooltip-activate-mouse-motions-if-enabled):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/ebrowse.el (ebrowse-member-table, ebrowse-save-tree-as)
(ebrowse-view-exit-fn, ebrowse-tags-list-members-in-file)
(ebrowse-tags-next-file):
* progmodes/ebnf2ps.el (ebnf-generate-eps, ebnf-generate-eps)
(ebnf-eps-production-list, ebnf-begin-file, ebnf-log)
(ebnf-eps-finish-and-write):
* progmodes/cpp.el (cpp-edit-save):
* progmodes/cperl-mode.el (cperl-pod-to-manpage):
* progmodes/cc-defs.el (c-emacs-features):
* progmodes/antlr-mode.el (antlr-invalidate-context-cache)
(antlr-directory-dependencies):
* progmodes/ada-xref.el (ada-gnat-parse-gpr, ada-get-ali-file-name)
(ada-run-application, ada-find-in-src-path, ada-goto-parent)
(ada-find-any-references, ada-make-filename-from-adaname)
(ada-make-body-gnatstub):
* obsolete/rnews.el (news-list-news-groups):
* obsolete/resume.el (resume-suspend-hook,resume-write-buffer-to-file):
* obsolete/iso-acc.el (iso-acc-minibuf-setup):
* net/rcirc.el (rcirc-debug):
* net/newst-treeview.el (newsticker--treeview-list-add-item)
(newsticker--treeview-list-clear, newsticker-treeview-browse-url)
(newsticker--treeview-list-update-faces, newsticker-treeview-save)
(newsticker--treeview-item-show-text, newsticker--treeview-item-show)
(newsticker--treeview-tree-update-tag,newsticker--treeview-buffer-init)
(newsticker-treeview-show-item, newsticker--treeview-unfold-node)
(newsticker--treeview-list-clear-highlight)
(newsticker--treeview-list-update-highlight)
(newsticker--treeview-list-highlight-start)
(newsticker--treeview-tree-update-highlight)
(newsticker--treeview-get-selected-item)
(newsticker-treeview-mark-list-items-old)
(newsticker--treeview-set-current-node):
* net/newst-plainview.el (newsticker--buffer-set-uptodate):
* net/newst-backend.el (newsticker--get-news-by-funcall)
(newsticker--get-news-by-wget, newsticker--image-get)
(newsticker--image-sentinel):
* net/mairix.el (mairix-rmail-fetch-field, mairix-gnus-fetch-field):
* net/eudcb-ph.el (eudc-ph-do-request, eudc-ph-open-session):
(eudc-ph-close-session):
* net/eudc.el (eudc-save-options):
* language/thai-word.el (thai-update-word-table):
* language/japan-util.el (japanese-string-conversion):
* international/titdic-cnv.el (tsang-quick-converter)
(ziranma-converter, ctlau-converter):
* international/mule-cmds.el (describe-language-environment):
* international/ja-dic-cnv.el (skkdic-convert-okuri-ari)
(skkdic-convert-postfix, skkdic-convert-prefix):
(skkdic-convert-okuri-nasi, skkdic-convert):
* emacs-lisp/re-builder.el (reb-update-overlays):
* emacs-lisp/pp.el (pp-to-string, pp-display-expression):
* emacs-lisp/gulp.el (gulp-send-requests):
* emacs-lisp/find-gc.el (trace-call-tree):
* emacs-lisp/eieio-opt.el (eieio-browse, eieio-describe-class)
(eieio-describe-generic):
* emacs-lisp/eieio-base.el (eieio-persistent-read):
* emacs-lisp/edebug.el (edebug-outside-excursion):
* emacs-lisp/debug.el (debugger-make-xrefs):
* emacs-lisp/cust-print.el (custom-prin1-to-string):
* emacs-lisp/chart.el (chart-new-buffer):
* emacs-lisp/authors.el (authors-scan-el, authors-scan-change-log):
Use with-current-buffer.
* textmodes/artist.el (artist-system): Don't call
copy-sequence on a fresh string.
* progmodes/idlw-shell.el (easymenu setup): Use dolist.
2009-10-31 02:38:34 +00:00
|
|
|
|
(with-current-buffer (or buffer (current-buffer))
|
2011-09-13 17:02:27 -04:00
|
|
|
|
(save-excursion
|
|
|
|
|
(setq buffer (current-buffer))
|
|
|
|
|
(let ((inhibit-read-only t)
|
2011-09-13 17:13:10 -04:00
|
|
|
|
(old-end (point-min)) (new-end (point-min)))
|
|
|
|
|
;; If we saved an old backtrace, find the common part
|
|
|
|
|
;; between the new and the old.
|
|
|
|
|
;; Compare line by line, starting from the end,
|
|
|
|
|
;; because that's the part that is likely to be unchanged.
|
|
|
|
|
(if debugger-previous-backtrace
|
|
|
|
|
(let (old-start new-start (all-match t))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert debugger-previous-backtrace)
|
|
|
|
|
(while (and all-match (not (bobp)))
|
|
|
|
|
(setq old-end (point))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(setq old-start (point))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(setq new-end (point))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(setq new-start (point)))
|
|
|
|
|
(if (not (zerop
|
|
|
|
|
(let ((case-fold-search nil))
|
|
|
|
|
(compare-buffer-substrings
|
|
|
|
|
(current-buffer) old-start old-end
|
|
|
|
|
buffer new-start new-end))))
|
|
|
|
|
(setq all-match nil))))
|
|
|
|
|
;; Now new-end is the position of the start of the
|
|
|
|
|
;; unchanged part in the current buffer, and old-end is
|
|
|
|
|
;; the position of that same text in the saved old
|
|
|
|
|
;; backtrace. But we must subtract (point-min) since strings are
|
|
|
|
|
;; indexed in origin 0.
|
2001-12-16 03:48:41 +00:00
|
|
|
|
|
2011-09-13 17:13:10 -04:00
|
|
|
|
;; Replace the unchanged part of the backtrace
|
|
|
|
|
;; with the text from debugger-previous-backtrace,
|
|
|
|
|
;; since that already has the proper xrefs.
|
|
|
|
|
;; With this optimization, we only need to scan
|
|
|
|
|
;; the changed part of the backtrace.
|
|
|
|
|
(delete-region new-end (point-max))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert (substring debugger-previous-backtrace
|
|
|
|
|
(- old-end (point-min))))
|
|
|
|
|
;; Make the unchanged part of the backtrace inaccessible
|
|
|
|
|
;; so it won't be scanned.
|
|
|
|
|
(narrow-to-region (point-min) new-end)))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2011-09-13 17:13:10 -04:00
|
|
|
|
;; Scan the new part of the backtrace, inserting xrefs.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (progn
|
|
|
|
|
(goto-char (+ (point) 2))
|
|
|
|
|
(skip-syntax-forward "^w_")
|
|
|
|
|
(not (eobp)))
|
|
|
|
|
(let* ((beg (point))
|
|
|
|
|
(end (progn (skip-syntax-forward "w_") (point)))
|
|
|
|
|
(sym (intern-soft (buffer-substring-no-properties
|
|
|
|
|
beg end)))
|
|
|
|
|
(file (and sym (symbol-file sym 'defun))))
|
|
|
|
|
(when file
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
;; help-xref-button needs to operate on something matched
|
|
|
|
|
;; by a regexp, so set that up for it.
|
|
|
|
|
(re-search-forward "\\(\\sw\\|\\s_\\)+")
|
|
|
|
|
(help-xref-button 0 'help-function-def sym file)))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
(widen))
|
2011-09-13 17:02:27 -04:00
|
|
|
|
(setq debugger-previous-backtrace (buffer-string)))))
|
1999-11-03 13:43:19 +00:00
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(defun debugger-step-through ()
|
|
|
|
|
"Proceed, stepping through subexpressions of this expression.
|
|
|
|
|
Enter another debugger on next entry to eval, apply or funcall."
|
|
|
|
|
(interactive)
|
|
|
|
|
(setq debugger-step-after-exit t)
|
2005-03-08 20:15:57 +00:00
|
|
|
|
(setq debugger-jumping-flag t)
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(setq debugger-will-be-back t)
|
2005-03-08 20:15:57 +00:00
|
|
|
|
(add-hook 'post-command-hook 'debugger-reenable)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(message "Proceeding, will debug on next eval or call.")
|
|
|
|
|
(exit-recursive-edit))
|
|
|
|
|
|
|
|
|
|
(defun debugger-continue ()
|
|
|
|
|
"Continue, evaluating this expression without stopping."
|
|
|
|
|
(interactive)
|
1999-12-19 13:12:28 +00:00
|
|
|
|
(unless debugger-may-continue
|
|
|
|
|
(error "Cannot continue"))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(message "Continuing.")
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
;; Check to see if we've flagged some frame for debug-on-exit, in which
|
|
|
|
|
;; case we'll probably come back to the debugger soon.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (re-search-forward "^\\* " nil t)
|
|
|
|
|
(setq debugger-will-be-back t)))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(exit-recursive-edit))
|
|
|
|
|
|
|
|
|
|
(defun debugger-return-value (val)
|
|
|
|
|
"Continue, specifying value to return.
|
|
|
|
|
This is only useful when the value returned from the debugger
|
|
|
|
|
will be used, such as in a debug on exit from a frame."
|
|
|
|
|
(interactive "XReturn value (evaluated): ")
|
2011-09-19 17:14:23 -04:00
|
|
|
|
(when (memq (car debugger-args) '(t lambda error debug))
|
|
|
|
|
(error "Cannot return a value %s"
|
|
|
|
|
(if (eq (car debugger-args) 'error)
|
|
|
|
|
"from an error" "at function entrance")))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(setq debugger-value val)
|
|
|
|
|
(princ "Returning " t)
|
|
|
|
|
(prin1 debugger-value)
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
;; Check to see if we've flagged some frame for debug-on-exit, in which
|
|
|
|
|
;; case we'll probably come back to the debugger soon.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (re-search-forward "^\\* " nil t)
|
|
|
|
|
(setq debugger-will-be-back t)))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(exit-recursive-edit))
|
|
|
|
|
|
|
|
|
|
(defun debugger-jump ()
|
|
|
|
|
"Continue to exit from this frame, with all debug-on-entry suspended."
|
|
|
|
|
(interactive)
|
2002-02-06 15:36:41 +00:00
|
|
|
|
(debugger-frame)
|
2005-03-03 16:25:13 +00:00
|
|
|
|
(setq debugger-jumping-flag t)
|
|
|
|
|
(add-hook 'post-command-hook 'debugger-reenable)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(message "Continuing through this frame")
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(setq debugger-will-be-back t)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(exit-recursive-edit))
|
|
|
|
|
|
|
|
|
|
(defun debugger-reenable ()
|
2005-03-03 16:25:13 +00:00
|
|
|
|
"Turn all debug-on-entry functions back on.
|
|
|
|
|
This function is put on `post-command-hook' by `debugger-jump' and
|
|
|
|
|
removes itself from that hook."
|
|
|
|
|
(setq debugger-jumping-flag nil)
|
|
|
|
|
(remove-hook 'post-command-hook 'debugger-reenable))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(defun debugger-frame-number (&optional skip-base)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
"Return number of frames in backtrace before the one point points at."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(if (looking-at " *;;;\\|[a-z]")
|
|
|
|
|
(error "This line is not a function call"))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(let ((opoint (point))
|
|
|
|
|
(count 0))
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(unless skip-base
|
|
|
|
|
(while (not (eq (cadr (backtrace-frame count)) 'debug))
|
|
|
|
|
(setq count (1+ count)))
|
|
|
|
|
;; Skip debug--implement-debug-on-entry frame.
|
|
|
|
|
(when (eq 'debug--implement-debug-on-entry
|
|
|
|
|
(cadr (backtrace-frame (1+ count))))
|
|
|
|
|
(setq count (+ 2 count))))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(goto-char (point-min))
|
2005-03-01 13:02:37 +00:00
|
|
|
|
(when (looking-at "Debugger entered--\\(Lisp error\\|returning value\\):")
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
(forward-sexp 1))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(forward-line 1)
|
|
|
|
|
(while (progn
|
|
|
|
|
(forward-char 2)
|
2013-12-02 09:45:22 -05:00
|
|
|
|
(cond ((debugger--locals-visible-p)
|
|
|
|
|
(goto-char (next-single-char-property-change
|
|
|
|
|
(point) 'locals-visible)))
|
|
|
|
|
((= (following-char) ?\()
|
|
|
|
|
(forward-sexp 1))
|
|
|
|
|
(t
|
|
|
|
|
(forward-sexp 2)))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(forward-line 1)
|
|
|
|
|
(<= (point) opoint))
|
2002-02-01 04:21:38 +00:00
|
|
|
|
(if (looking-at " *;;;")
|
|
|
|
|
(forward-line 1))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(setq count (1+ count)))
|
|
|
|
|
count)))
|
|
|
|
|
|
|
|
|
|
(defun debugger-frame ()
|
|
|
|
|
"Request entry to debugger when this frame exits.
|
|
|
|
|
Applies to the frame whose line point is on in the backtrace."
|
|
|
|
|
(interactive)
|
2002-02-06 15:36:41 +00:00
|
|
|
|
(backtrace-debug (debugger-frame-number) t)
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(beginning-of-line)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(if (= (following-char) ? )
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(let ((inhibit-read-only t))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(delete-char 1)
|
|
|
|
|
(insert ?*)))
|
|
|
|
|
(beginning-of-line))
|
|
|
|
|
|
|
|
|
|
(defun debugger-frame-clear ()
|
1998-05-17 22:02:49 +00:00
|
|
|
|
"Do not enter debugger when this frame exits.
|
1991-12-21 08:23:15 +00:00
|
|
|
|
Applies to the frame whose line point is on in the backtrace."
|
|
|
|
|
(interactive)
|
2002-02-06 15:36:41 +00:00
|
|
|
|
(backtrace-debug (debugger-frame-number) nil)
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(beginning-of-line)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(if (= (following-char) ?*)
|
2005-06-09 03:09:30 +00:00
|
|
|
|
(let ((inhibit-read-only t))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(delete-char 1)
|
|
|
|
|
(insert ? )))
|
|
|
|
|
(beginning-of-line))
|
|
|
|
|
|
1997-12-04 04:42:31 +00:00
|
|
|
|
(defmacro debugger-env-macro (&rest body)
|
|
|
|
|
"Run BODY in original environment."
|
Use `declare' in defmacros.
* lisp/window.el (save-selected-window):
* lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table):
* lisp/progmodes/python.el (def-python-skeleton):
* lisp/net/dbus.el (dbus-ignore-errors):
* lisp/jka-cmpr-hook.el (with-auto-compression-mode):
* lisp/international/mule.el (with-category-table):
* lisp/emacs-lisp/timer.el (with-timeout):
* lisp/emacs-lisp/lisp-mnt.el (lm-with-file):
* lisp/emacs-lisp/eieio.el (with-slots):
* lisp/emacs-lisp/easymenu.el (easy-menu-define):
* lisp/emacs-lisp/debug.el (debugger-env-macro):
* lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq)
(Multiple-value-call, Multiple-value-prog1):
* lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key)
(cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and
edebug rule to definition.
* lisp/emacs-lisp/lisp-mode.el (save-selected-window)
(with-current-buffer, combine-after-change-calls)
(with-output-to-string, with-temp-file, with-temp-buffer)
(with-temp-message, with-syntax-table, read-if, eval-after-load)
(dolist, dotimes, when, unless):
* lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
2010-08-30 15:03:05 +02:00
|
|
|
|
(declare (indent 0))
|
2015-02-25 01:03:14 -05:00
|
|
|
|
`(progn
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(set-match-data debugger-outer-match-data)
|
|
|
|
|
(prog1
|
|
|
|
|
(progn ,@body)
|
|
|
|
|
(setq debugger-outer-match-data (match-data)))))
|
1997-12-04 04:42:31 +00:00
|
|
|
|
|
2013-12-02 09:45:22 -05:00
|
|
|
|
(defun debugger--backtrace-base ()
|
|
|
|
|
"Return the function name that marks the top of the backtrace.
|
|
|
|
|
See `backtrace-frame'."
|
|
|
|
|
(cond ((eq 'debug--implement-debug-on-entry
|
|
|
|
|
(cadr (backtrace-frame 1 'debug)))
|
|
|
|
|
'debug--implement-debug-on-entry)
|
|
|
|
|
(t 'debug)))
|
|
|
|
|
|
2013-08-15 13:21:19 -04:00
|
|
|
|
(defun debugger-eval-expression (exp &optional nframe)
|
2013-07-26 03:38:18 -04:00
|
|
|
|
"Eval an expression, in an environment like that outside the debugger.
|
|
|
|
|
The environment used is the one when entering the activation frame at point."
|
1994-03-22 20:41:00 +00:00
|
|
|
|
(interactive
|
2013-08-15 13:21:19 -04:00
|
|
|
|
(list (read--expression "Eval in stack frame: ")))
|
|
|
|
|
(let ((nframe (or nframe
|
|
|
|
|
(condition-case nil (1+ (debugger-frame-number 'skip-base))
|
|
|
|
|
(error 0)))) ;; If on first line.
|
2013-12-02 09:45:22 -05:00
|
|
|
|
(base (debugger--backtrace-base)))
|
2013-07-26 03:38:18 -04:00
|
|
|
|
(debugger-env-macro
|
|
|
|
|
(let ((val (backtrace-eval exp nframe base)))
|
|
|
|
|
(prog1
|
|
|
|
|
(prin1 val t)
|
|
|
|
|
(let ((str (eval-expression-print-format val)))
|
|
|
|
|
(if str (princ str t))))))))
|
2013-12-02 09:45:22 -05:00
|
|
|
|
|
|
|
|
|
(defun debugger--locals-visible-p ()
|
|
|
|
|
"Are the local variables of the current stack frame visible?"
|
|
|
|
|
(save-excursion
|
|
|
|
|
(move-to-column 2)
|
|
|
|
|
(get-text-property (point) 'locals-visible)))
|
|
|
|
|
|
|
|
|
|
(defun debugger--insert-locals (locals)
|
|
|
|
|
"Insert the local variables LOCALS at point."
|
|
|
|
|
(cond ((null locals)
|
|
|
|
|
(insert "\n [no locals]"))
|
|
|
|
|
(t
|
|
|
|
|
(let ((print-escape-newlines t))
|
|
|
|
|
(dolist (s+v locals)
|
|
|
|
|
(let ((symbol (car s+v))
|
|
|
|
|
(value (cdr s+v)))
|
|
|
|
|
(insert "\n ")
|
|
|
|
|
(prin1 symbol (current-buffer))
|
|
|
|
|
(insert " = ")
|
|
|
|
|
(prin1 value (current-buffer))))))))
|
|
|
|
|
|
|
|
|
|
(defun debugger--show-locals ()
|
|
|
|
|
"For the frame at point, insert locals and add text properties."
|
|
|
|
|
(let* ((nframe (1+ (debugger-frame-number 'skip-base)))
|
|
|
|
|
(base (debugger--backtrace-base))
|
|
|
|
|
(locals (backtrace--locals nframe base))
|
|
|
|
|
(inhibit-read-only t))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((start (progn
|
|
|
|
|
(move-to-column 2)
|
|
|
|
|
(point))))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(debugger--insert-locals locals)
|
|
|
|
|
(add-text-properties start (point) '(locals-visible t))))))
|
|
|
|
|
|
|
|
|
|
(defun debugger--hide-locals ()
|
|
|
|
|
"Delete local variables and remove the text property."
|
|
|
|
|
(let* ((col (current-column))
|
|
|
|
|
(end (progn
|
|
|
|
|
(move-to-column 2)
|
|
|
|
|
(next-single-char-property-change (point) 'locals-visible)))
|
|
|
|
|
(start (previous-single-char-property-change end 'locals-visible))
|
|
|
|
|
(inhibit-read-only t))
|
|
|
|
|
(remove-text-properties start end '(locals-visible))
|
|
|
|
|
(goto-char start)
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(delete-region (point) end)
|
|
|
|
|
(move-to-column col)))
|
|
|
|
|
|
|
|
|
|
(defun debugger-toggle-locals ()
|
|
|
|
|
"Show or hide local variables of the current stack frame."
|
|
|
|
|
(interactive)
|
|
|
|
|
(cond ((debugger--locals-visible-p)
|
|
|
|
|
(debugger--hide-locals))
|
|
|
|
|
(t
|
|
|
|
|
(debugger--show-locals))))
|
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
2005-02-26 05:28:24 +00:00
|
|
|
|
(defvar debugger-mode-map
|
2008-04-02 06:35:21 +00:00
|
|
|
|
(let ((map (make-keymap))
|
|
|
|
|
(menu-map (make-sparse-keymap)))
|
2005-02-26 05:28:24 +00:00
|
|
|
|
(set-keymap-parent map button-buffer-map)
|
|
|
|
|
(suppress-keymap map)
|
|
|
|
|
(define-key map "-" 'negative-argument)
|
|
|
|
|
(define-key map "b" 'debugger-frame)
|
|
|
|
|
(define-key map "c" 'debugger-continue)
|
|
|
|
|
(define-key map "j" 'debugger-jump)
|
|
|
|
|
(define-key map "r" 'debugger-return-value)
|
|
|
|
|
(define-key map "u" 'debugger-frame-clear)
|
|
|
|
|
(define-key map "d" 'debugger-step-through)
|
|
|
|
|
(define-key map "l" 'debugger-list-functions)
|
|
|
|
|
(define-key map "h" 'describe-mode)
|
|
|
|
|
(define-key map "q" 'top-level)
|
|
|
|
|
(define-key map "e" 'debugger-eval-expression)
|
2013-12-08 13:23:50 -08:00
|
|
|
|
(define-key map "v" 'debugger-toggle-locals) ; "v" is for "variables".
|
2005-02-26 05:28:24 +00:00
|
|
|
|
(define-key map " " 'next-line)
|
|
|
|
|
(define-key map "R" 'debugger-record-expression)
|
2005-07-10 17:06:33 +00:00
|
|
|
|
(define-key map "\C-m" 'debug-help-follow)
|
2005-02-26 05:28:24 +00:00
|
|
|
|
(define-key map [mouse-2] 'push-button)
|
2008-04-02 06:35:21 +00:00
|
|
|
|
(define-key map [menu-bar debugger] (cons "Debugger" menu-map))
|
|
|
|
|
(define-key menu-map [deb-top]
|
|
|
|
|
'(menu-item "Quit" top-level
|
2008-04-07 01:20:06 +00:00
|
|
|
|
:help "Quit debugging and return to top level"))
|
2008-04-02 06:35:21 +00:00
|
|
|
|
(define-key menu-map [deb-s0] '("--"))
|
|
|
|
|
(define-key menu-map [deb-descr]
|
|
|
|
|
'(menu-item "Describe Debugger Mode" describe-mode
|
|
|
|
|
:help "Display documentation for debugger-mode"))
|
|
|
|
|
(define-key menu-map [deb-hfol]
|
|
|
|
|
'(menu-item "Help Follow" debug-help-follow
|
|
|
|
|
:help "Follow cross-reference"))
|
|
|
|
|
(define-key menu-map [deb-nxt]
|
|
|
|
|
'(menu-item "Next Line" next-line
|
|
|
|
|
:help "Move cursor down"))
|
|
|
|
|
(define-key menu-map [deb-s1] '("--"))
|
|
|
|
|
(define-key menu-map [deb-lfunc]
|
|
|
|
|
'(menu-item "List debug on entry functions" debugger-list-functions
|
|
|
|
|
:help "Display a list of all the functions now set to debug on entry"))
|
|
|
|
|
(define-key menu-map [deb-fclear]
|
|
|
|
|
'(menu-item "Cancel debug frame" debugger-frame-clear
|
|
|
|
|
:help "Do not enter debugger when this frame exits"))
|
|
|
|
|
(define-key menu-map [deb-frame]
|
|
|
|
|
'(menu-item "Debug frame" debugger-frame
|
|
|
|
|
:help "Request entry to debugger when this frame exits"))
|
|
|
|
|
(define-key menu-map [deb-s2] '("--"))
|
|
|
|
|
(define-key menu-map [deb-ret]
|
|
|
|
|
'(menu-item "Return value..." debugger-return-value
|
|
|
|
|
:help "Continue, specifying value to return."))
|
|
|
|
|
(define-key menu-map [deb-rec]
|
|
|
|
|
'(menu-item "Display and Record Expression" debugger-record-expression
|
|
|
|
|
:help "Display a variable's value and record it in `*Backtrace-record*' buffer"))
|
|
|
|
|
(define-key menu-map [deb-eval]
|
|
|
|
|
'(menu-item "Eval Expression..." debugger-eval-expression
|
|
|
|
|
:help "Eval an expression, in an environment like that outside the debugger"))
|
|
|
|
|
(define-key menu-map [deb-jump]
|
|
|
|
|
'(menu-item "Jump" debugger-jump
|
|
|
|
|
:help "Continue to exit from this frame, with all debug-on-entry suspended"))
|
|
|
|
|
(define-key menu-map [deb-cont]
|
|
|
|
|
'(menu-item "Continue" debugger-continue
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
:help "Continue, evaluating this expression without stopping"))
|
2008-04-02 06:35:21 +00:00
|
|
|
|
(define-key menu-map [deb-step]
|
|
|
|
|
'(menu-item "Step through" debugger-step-through
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
:help "Proceed, stepping through subexpressions of this expression"))
|
2005-02-26 05:28:24 +00:00
|
|
|
|
map))
|
2005-07-10 17:07:19 +00:00
|
|
|
|
|
|
|
|
|
(put 'debugger-mode 'mode-class 'special)
|
|
|
|
|
|
2013-09-10 23:31:56 -04:00
|
|
|
|
(define-derived-mode debugger-mode fundamental-mode "Debugger"
|
2005-07-10 17:07:19 +00:00
|
|
|
|
"Mode for backtrace buffers, selected in debugger.
|
|
|
|
|
\\<debugger-mode-map>
|
|
|
|
|
A line starts with `*' if exiting that frame will call the debugger.
|
|
|
|
|
Type \\[debugger-frame] or \\[debugger-frame-clear] to set or remove the `*'.
|
|
|
|
|
|
|
|
|
|
When in debugger due to frame being exited,
|
|
|
|
|
use the \\[debugger-return-value] command to override the value
|
|
|
|
|
being returned from that frame.
|
|
|
|
|
|
|
|
|
|
Use \\[debug-on-entry] and \\[cancel-debug-on-entry] to control
|
|
|
|
|
which functions will enter the debugger when called.
|
|
|
|
|
|
|
|
|
|
Complete list of commands:
|
|
|
|
|
\\{debugger-mode-map}"
|
|
|
|
|
(setq truncate-lines t)
|
|
|
|
|
(set-syntax-table emacs-lisp-mode-syntax-table)
|
2013-09-10 23:31:56 -04:00
|
|
|
|
(use-local-map debugger-mode-map))
|
2005-07-10 17:06:33 +00:00
|
|
|
|
|
1998-04-05 18:26:32 +00:00
|
|
|
|
(defcustom debugger-record-buffer "*Debugger-record*"
|
2009-07-22 02:45:34 +00:00
|
|
|
|
"Buffer name for expression values, for \\[debugger-record-expression]."
|
1998-04-05 18:26:32 +00:00
|
|
|
|
:type 'string
|
1998-04-20 02:34:53 +00:00
|
|
|
|
:group 'debugger
|
|
|
|
|
:version "20.3")
|
1997-12-04 04:42:31 +00:00
|
|
|
|
|
|
|
|
|
(defun debugger-record-expression (exp)
|
|
|
|
|
"Display a variable's value and record it in `*Backtrace-record*' buffer."
|
|
|
|
|
(interactive
|
2013-08-15 13:21:19 -04:00
|
|
|
|
(list (read--expression "Record Eval: ")))
|
1997-12-04 04:42:31 +00:00
|
|
|
|
(let* ((buffer (get-buffer-create debugger-record-buffer))
|
|
|
|
|
(standard-output buffer))
|
|
|
|
|
(princ (format "Debugger Eval (%s): " exp))
|
|
|
|
|
(princ (debugger-eval-expression exp))
|
|
|
|
|
(terpri))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer debugger-record-buffer)
|
2005-06-11 23:52:51 +00:00
|
|
|
|
(message "%s"
|
2005-03-26 14:46:16 +00:00
|
|
|
|
(buffer-substring (line-beginning-position 0)
|
|
|
|
|
(line-end-position 0)))))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
2008-06-21 23:02:20 +00:00
|
|
|
|
(declare-function help-xref-interned "help-mode" (symbol))
|
|
|
|
|
|
2005-07-10 17:06:33 +00:00
|
|
|
|
(defun debug-help-follow (&optional pos)
|
|
|
|
|
"Follow cross-reference at POS, defaulting to point.
|
|
|
|
|
|
|
|
|
|
For the cross-reference format, see `help-make-xrefs'."
|
|
|
|
|
(interactive "d")
|
|
|
|
|
(require 'help-mode)
|
2006-03-20 04:44:47 +00:00
|
|
|
|
;; Ideally we'd just do (call-interactively 'help-follow) except that this
|
|
|
|
|
;; assumes we're already in a *Help* buffer and reuses it, so it ends up
|
|
|
|
|
;; incorrectly "reusing" the *Backtrace* buffer to show the help info.
|
2005-07-10 17:06:33 +00:00
|
|
|
|
(unless pos
|
|
|
|
|
(setq pos (point)))
|
|
|
|
|
(unless (push-button pos)
|
|
|
|
|
;; check if the symbol under point is a function or variable
|
|
|
|
|
(let ((sym
|
|
|
|
|
(intern
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char pos) (skip-syntax-backward "w_")
|
|
|
|
|
(buffer-substring (point)
|
|
|
|
|
(progn (skip-syntax-forward "w_")
|
|
|
|
|
(point)))))))
|
|
|
|
|
(when (or (boundp sym) (fboundp sym) (facep sym))
|
2005-10-24 03:52:35 +00:00
|
|
|
|
(help-xref-interned sym)))))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
2005-03-10 09:43:01 +00:00
|
|
|
|
;; When you change this, you may also need to change the number of
|
|
|
|
|
;; frames that the debugger skips.
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(defun debug--implement-debug-on-entry (&rest _ignore)
|
2005-03-10 09:43:01 +00:00
|
|
|
|
"Conditionally call the debugger.
|
|
|
|
|
A call to this function is inserted by `debug-on-entry' to cause
|
|
|
|
|
functions to break on entry."
|
|
|
|
|
(if (or inhibit-debug-on-entry debugger-jumping-flag)
|
|
|
|
|
nil
|
|
|
|
|
(funcall debugger 'debug)))
|
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun debug-on-entry (function)
|
|
|
|
|
"Request FUNCTION to invoke debugger each time it is called.
|
2005-06-14 12:00:50 +00:00
|
|
|
|
|
2005-06-11 23:52:51 +00:00
|
|
|
|
When called interactively, prompt for FUNCTION in the minibuffer.
|
2005-06-14 12:00:50 +00:00
|
|
|
|
|
|
|
|
|
This works by modifying the definition of FUNCTION. If you tell the
|
|
|
|
|
debugger to continue, FUNCTION's execution proceeds. If FUNCTION is a
|
|
|
|
|
normal function or a macro written in Lisp, you can also step through
|
|
|
|
|
its execution. FUNCTION can also be a primitive that is not a special
|
|
|
|
|
form, in which case stepping is not possible. Break-on-entry for
|
|
|
|
|
primitive functions only works when that function is called from Lisp.
|
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
Use \\[cancel-debug-on-entry] to cancel the effect of this command.
|
1994-02-23 23:17:34 +00:00
|
|
|
|
Redefining FUNCTION also cancels it."
|
2005-06-23 08:20:33 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(let ((fn (function-called-at-point)) val)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(when (special-form-p fn)
|
2005-06-23 08:20:33 +00:00
|
|
|
|
(setq fn nil))
|
2005-08-06 17:48:15 +00:00
|
|
|
|
(setq val (completing-read
|
2005-06-23 08:20:33 +00:00
|
|
|
|
(if fn
|
|
|
|
|
(format "Debug on entry to function (default %s): " fn)
|
|
|
|
|
"Debug on entry to function: ")
|
|
|
|
|
obarray
|
|
|
|
|
#'(lambda (symbol)
|
|
|
|
|
(and (fboundp symbol)
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(not (special-form-p symbol))))
|
2005-06-23 08:20:33 +00:00
|
|
|
|
t nil nil (symbol-name fn)))
|
|
|
|
|
(list (if (equal val "") fn (intern val)))))
|
2013-12-12 14:47:11 -05:00
|
|
|
|
(advice-add function :before #'debug--implement-debug-on-entry
|
|
|
|
|
'((depth . -100)))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
function)
|
|
|
|
|
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(defun debug--function-list ()
|
|
|
|
|
"List of functions currently set for debug on entry."
|
|
|
|
|
(let ((funs '()))
|
|
|
|
|
(mapatoms
|
|
|
|
|
(lambda (s)
|
|
|
|
|
(when (advice-member-p #'debug--implement-debug-on-entry s)
|
|
|
|
|
(push s funs))))
|
|
|
|
|
funs))
|
|
|
|
|
|
1991-12-21 08:23:15 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun cancel-debug-on-entry (&optional function)
|
|
|
|
|
"Undo effect of \\[debug-on-entry] on FUNCTION.
|
2005-06-13 08:14:06 +00:00
|
|
|
|
If FUNCTION is nil, cancel debug-on-entry for all functions.
|
2005-06-11 23:52:51 +00:00
|
|
|
|
When called interactively, prompt for FUNCTION in the minibuffer.
|
|
|
|
|
To specify a nil argument interactively, exit with an empty minibuffer."
|
1992-01-09 05:06:34 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list (let ((name
|
2005-06-13 23:40:05 +00:00
|
|
|
|
(completing-read
|
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
* woman.el (woman-file-name):
* wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* w32-fns.el (set-w32-system-coding-system):
* vc.el (vc-version-diff, vc-annotate):
* textmodes/reftex-auc.el (reftex-arg-cite)
(reftex-arg-index-tag):
* textmodes/refer.el (refer-get-bib-files):
* textmodes/artist.el (artist-figlet-choose-font):
* terminal.el (terminal-emulator):
* replace.el (occur-read-primary-args):
* rect.el (string-rectangle, string-insert-rectangle):
* ps-print.el (ps-print-preprint):
* progmodes/pascal.el (pascal-goto-defun):
* progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
* progmodes/compile.el (compilation-find-file):
* printing.el (pr-interactive-n-up):
* play/animate.el (animate-birthday-present):
* net/rcompile.el (remote-compile):
* man.el (man, Man-goto-section, Man-follow-manual-reference):
* mail/rmailsum.el (rmail-summary-search-backward)
(rmail-summary-search):
* mail/rmailout.el (rmail-output-read-rmail-file-name)
(rmail-output-read-file-name):
* mail/rmail.el (rmail-search, rmail-search-backwards):
* mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
* locate.el (locate):
* international/quail.el (quail-show-keyboard-layout):
* international/mule.el (set-buffer-file-coding-system)
(revert-buffer-with-coding-system, set-file-name-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system):
* international/mule-diag.el (describe-coding-system)
(describe-font, describe-fontset):
* international/mule-cmds.el (universal-coding-system-argument)
(search-unencodable-char, describe-input-method)
(set-language-environment, describe-language-environment):
* international/codepage.el (codepage-setup):
* international/code-pages.el (codepage-setup):
* info.el (Info-search, Info-follow-reference)
(Info-search-backward):
* emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-clear-cache, ad-activate)
(ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
(ad-enable-advice, ad-disable-advice, ad-remove-advice)
(ad-read-regexp):
* ediff-util.el (ediff-toggle-regexp-match):
* ediff-ptch.el (ediff-prompt-for-patch-file):
* dired-aux.el (dired-diff):
* diff.el (diff):
* cus-edit.el (custom-variable-prompt):
* calendar/timeclock.el (timeclock-ask-for-project):
* calc/calcalg3.el (calc-get-fit-variables):
* calc/calc-store.el (calc-edit-variable)
(calc-permanent-variable):
* vc-mcvs.el (vc-mcvs-register):
* shadowfile.el (shadow-define-literal-group):
* woman.el (woman-file-name):
* vc.el (vc-version-diff, vc-merge):
* textmodes/reftex-index.el (reftex-index-complete-tag):
* format.el (format-decode-buffer, format-decode-region):
* emulation/viper-cmd.el (viper-read-string-with-history):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor, ediff-revision):
* completion.el (interactive-completion-string-reader):
* calc/calc-prog.el (calc-user-define-formula):
Follow convention for reading with the minibuffer.
2005-09-24 13:44:02 +00:00
|
|
|
|
"Cancel debug on entry to function (default all functions): "
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(mapcar #'symbol-name (debug--function-list)) nil t)))
|
2005-06-13 08:14:06 +00:00
|
|
|
|
(when name
|
|
|
|
|
(unless (string= name "")
|
|
|
|
|
(intern name))))))
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(if function
|
1991-12-21 08:23:15 +00:00
|
|
|
|
(progn
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(advice-remove function #'debug--implement-debug-on-entry)
|
1991-12-21 08:23:15 +00:00
|
|
|
|
function)
|
2014-01-05 22:25:30 -08:00
|
|
|
|
(message "Canceling debug-on-entry for all functions")
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(mapcar #'cancel-debug-on-entry (debug--function-list))))
|
1991-12-21 08:23:15 +00:00
|
|
|
|
|
|
|
|
|
(defun debugger-list-functions ()
|
|
|
|
|
"Display a list of all the functions now set to debug on entry."
|
|
|
|
|
(interactive)
|
2005-02-26 05:28:24 +00:00
|
|
|
|
(require 'help-mode)
|
2009-10-02 03:48:36 +00:00
|
|
|
|
(help-setup-xref '(debugger-list-functions)
|
|
|
|
|
(called-interactively-p 'interactive))
|
2005-02-26 05:28:24 +00:00
|
|
|
|
(with-output-to-temp-buffer (help-buffer)
|
|
|
|
|
(with-current-buffer standard-output
|
* lisp/emacs-lisp/nadvice.el: New package.
* lisp/subr.el (special-form-p): New function.
* lisp/emacs-lisp/elp.el: Use lexical-binding and advice-add.
(elp-all-instrumented-list): Remove var.
(elp-not-profilable): Remove elp-wrapper.
(elp-profilable-p): Use autoloadp and special-form-p.
(elp--advice-name): New const.
(elp-instrument-function): Use advice-add.
(elp--instrumented-p): New predicate.
(elp-restore-function): Use advice-remove.
(elp-restore-all, elp-reset-all): Use mapatoms.
(elp-set-master): Use elp--instrumented-p.
(elp--make-wrapper): Rename from elp-wrapper, return a function
suitable for advice-add. Use cl-inf.
(elp-results): Use mapatoms+elp--instrumented-p.
* lisp/emacs-lisp/debug.el: Use lexical-binding and advice-add.
(debug-function-list): Remove var.
(debug): Rename arg, and then let-bind it explicitly inside.
(debugger-setup-buffer): Rename arg.
(debugger-setup-buffer): Adjust counts to new debug-on-entry setup.
(debugger-frame-number): Adjust to new debug-on-entry setup.
(debug--implement-debug-on-entry): Rename from
implement-debug-on-entry, add argument.
(debugger-special-form-p): Remove, use special-form-p instead.
(debug-on-entry): Use advice-add.
(debug--function-list): New function.
(cancel-debug-on-entry): Use it, along with advice-remove.
(debug-arglist, debug-convert-byte-code, debug-on-entry-1): Remove.
(debugger-list-functions): Use debug--function-list instead of
debug-function-list.
* lisp/emacs-lisp/advice.el (ad-save-real-definition): Remove, unused.
(ad-special-form-p): Remove, use special-form-p instead.
(ad-set-advice-info): Use add-function and remove-function.
(ad--defalias-fset): Adjust accordingly.
* test/automated/advice-tests.el: New tests.
2012-11-12 15:43:43 -05:00
|
|
|
|
(let ((funs (debug--function-list)))
|
|
|
|
|
(if (null funs)
|
|
|
|
|
(princ "No debug-on-entry functions now\n")
|
|
|
|
|
(princ "Functions set to debug on entry:\n\n")
|
|
|
|
|
(dolist (fun funs)
|
|
|
|
|
(make-text-button (point) (progn (prin1 fun) (point))
|
|
|
|
|
'type 'help-function
|
|
|
|
|
'help-args (list fun))
|
|
|
|
|
(terpri))
|
|
|
|
|
(terpri)
|
|
|
|
|
(princ "Note: if you have redefined a function, then it may no longer\n")
|
|
|
|
|
(princ "be set to debug on entry, even if it is in the list."))))))
|
1992-05-30 23:54:21 +00:00
|
|
|
|
|
1997-06-22 18:57:55 +00:00
|
|
|
|
(provide 'debug)
|
|
|
|
|
|
1992-05-30 23:54:21 +00:00
|
|
|
|
;;; debug.el ends here
|