branch: master commit cc32bab8f8fa983a6aa19a97d07a20023e5d6c0e Author: rocky <ro...@gnu.org> Commit: rocky <ro...@gnu.org>
Correct realgud:gdb-pid-associate call Fixes #132 * Add more FSF copyrights. * some 't -> t * track.el: missing prototype in enable/disable use --- realgud/common/bp.el | 17 ++++++++++++++++- realgud/common/buffer/backtrace.el | 6 +++--- realgud/common/buffer/command.el | 2 +- realgud/common/buffer/info.el | 20 +++++++++++++++++--- realgud/common/buffer/source.el | 31 ++++++++++++++++++++++++++++++- realgud/common/run.el | 1 - realgud/common/track.el | 1 + realgud/debugger/gdb/gdb.el | 2 +- 8 files changed, 69 insertions(+), 11 deletions(-) diff --git a/realgud/common/bp.el b/realgud/common/bp.el index 159daeb..a330945 100644 --- a/realgud/common/bp.el +++ b/realgud/common/bp.el @@ -1,4 +1,19 @@ -;; Copyright (C) 2010, 2012-2015 Rocky Bernstein <ro...@gnu.org> +;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc + +;; Author: Rocky Bernstein <ro...@gnu.org> + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program 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 +;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; Code associated with breakpoints (require 'image) diff --git a/realgud/common/buffer/backtrace.el b/realgud/common/buffer/backtrace.el index a46c65e..9f05c93 100644 --- a/realgud/common/buffer/backtrace.el +++ b/realgud/common/buffer/backtrace.el @@ -116,7 +116,7 @@ (realgud-cmdbuf-debugger-name))) (setq process (get-buffer-process (current-buffer))) (realgud-cmdbuf-info-in-srcbuf?= (not (realgud-cmdbuf? buffer))) - (realgud-cmdbuf-info-divert-output?= 't) + (realgud-cmdbuf-info-divert-output?= t) (setq realgud-track-divert-string nil) (realgud:cmd-backtrace 0) (while (and (eq 'run (process-status process)) @@ -418,7 +418,7 @@ filename, line number, whether the frame is selected as text properties." (match-end frame-group-pat))) (setq frame-num (string-to-number frame-num-str)) (setq frame-num-pos (match-beginning frame-group-pat)) - (add-to-list 'frame-num-pos-list frame-num-pos 't) + (add-to-list 'frame-num-pos-list frame-num-pos t) (add-text-properties (match-beginning frame-group-pat) (match-end frame-group-pat) (list 'mouse-face 'highlight @@ -433,7 +433,7 @@ filename, line number, whether the frame is selected as text properties." (match-end 0))) (setq frame-num (incf alt-frame-num)) (setq frame-num-pos (match-beginning 0)) - (add-to-list 'frame-num-pos-list frame-num-pos 't) + (add-to-list 'frame-num-pos-list frame-num-pos t) (add-text-properties (match-beginning 0) (match-end 0) (list 'mouse-face 'highlight 'help-echo "mouse-2: goto this frame" diff --git a/realgud/common/buffer/command.el b/realgud/common/buffer/command.el index 913c68e..fb80190 100644 --- a/realgud/common/buffer/command.el +++ b/realgud/common/buffer/command.el @@ -311,7 +311,7 @@ values set in the debugger's init.el." :bt-buf nil :last-input-end (point-max) :cmd-hash cmd-hash - :src-shortkey? 't + :src-shortkey? t :in-debugger? nil :callback-loc-fn (gethash "loc-callback-fn" regexp-hash) :callback-eval-filter (gethash "callback-eval-filter" diff --git a/realgud/common/buffer/info.el b/realgud/common/buffer/info.el index 328a478..571b614 100644 --- a/realgud/common/buffer/info.el +++ b/realgud/common/buffer/info.el @@ -1,5 +1,19 @@ -;;; Copyright (C) 2015 Rocky Bernstein <ro...@gnu.org> -;;; +;; Copyright (C) 2015, 2016 Free Software Foundation, Inc + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program 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 +;; along with this program. If not, see <http://www.gnu.org/licenses/>. +;;; process-command buffer things + ;;; A mode based off of org mode to show debugger information (eval-when-compile (require 'cl)) @@ -28,7 +42,7 @@ (define-derived-mode realgud:info-mode org-mode "Debugger Info" "Major mode for interacting realgud debugger information." (use-local-map realgud:info-mode-map) - (setq buffer-read-only 't) + (setq buffer-read-only t) ) ;; FIXME: diff --git a/realgud/common/buffer/source.el b/realgud/common/buffer/source.el index b050014..03e092d 100644 --- a/realgud/common/buffer/source.el +++ b/realgud/common/buffer/source.el @@ -1,4 +1,20 @@ -;;; Copyright (C) 2010, 2012-2015 Rocky Bernstein <ro...@gnu.org> +;;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc + +;; Author: Rocky Bernstein <ro...@gnu.org> + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program 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 +;; along with this program. If not, see <http://www.gnu.org/licenses/>. + ;;; source-code buffer code (eval-when-compile (defvar realgud-srcbuf-info) ;; is buffer local @@ -144,6 +160,19 @@ in it with those from CMDPROC-BUFFER" (realgud-srcbuf-info-cmdproc= cmdproc-buffer) (realgud-srcbuf-init src-buffer cmdproc-buffer)))) +;; FIXME: rewrite to add prompt function that only suggests +;; command buffers; +(defun realgud:cmdbuf-associate-buffer-name(cmdbuf-name) + "Associate a command buffer with for the current buffer which is +assumed to be a source-code buffer" + (interactive "brealgud command buffer: ") + (let ((cmdbuf (get-buffer cmdbuf-name))) + (unless (realgud-cmdbuf? cmdbuf) + (error "%s doesn't smell like a command buffer" cmdbuf-name)) + (realgud-srcbuf-init-or-update (current-buffer) cmdbuf ) + (realgud-short-key-mode-setup t) + )) + (defun realgud:cmdbuf-associate () "Associate a command buffer with the current (source-code) buffer." ;; realgud-short-key-mode-setup will attempt to associate if needed. diff --git a/realgud/common/run.el b/realgud/common/run.el index fc6268e..580216c 100644 --- a/realgud/common/run.el +++ b/realgud/common/run.el @@ -14,7 +14,6 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <http://www.gnu.org/licenses/>. -;;; Copyright (C) 2014-2015 Rocky Bernstein <ro...@gnu.org> ; (require 'term) diff --git a/realgud/common/track.el b/realgud/common/track.el index af62291..971534b 100644 --- a/realgud/common/track.el +++ b/realgud/common/track.el @@ -44,6 +44,7 @@ (declare-function fn-p-to-fn?-alias 'realgud-helper) (declare-function realgud-bp-add-info 'realgud-bp) (declare-function realgud-bp-del-info 'realgud-bp) +(declare-function realgud-bp-enable-disable-info 'realgud-bp) (declare-function realgud-cmdbuf-add-srcbuf 'realgud-buffer-command) (declare-function realgud-cmdbuf-debugger-name 'realgud-buffer-command) (declare-function realgud-cmdbuf-info-bp-list= 'realgud-buffer-command) diff --git a/realgud/debugger/gdb/gdb.el b/realgud/debugger/gdb/gdb.el index 19963a3..d513f93 100644 --- a/realgud/debugger/gdb/gdb.el +++ b/realgud/debugger/gdb/gdb.el @@ -94,7 +94,7 @@ current buffer to that realgud command buffer." (setq command-buf (realgud:gdb-find-command-buffer pid)) (if command-buf (with-current-buffer source-buf - (realgud:cmdbuf-associate (buffer-name command-buf))) + (realgud:cmdbuf-associate-name (buffer-name command-buf))) ))) ;;;###autoload