branch: master
commit 3993d136ec480545abd59fb84cf8d8fcb6707142
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Respect shortkey mode setting
Add FSF copyright
---
realgud/common/buffer/command.el | 16 +++++++++++++++-
realgud/common/track.el | 18 +++++++++++++-----
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/realgud/common/buffer/command.el b/realgud/common/buffer/command.el
index b49019f..67eca06 100644
--- a/realgud/common/buffer/command.el
+++ b/realgud/common/buffer/command.el
@@ -1,5 +1,19 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Author: Rocky Bernstein <[email protected]>
+
+;; 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
-;;; Copyright (C) 2010-2012, 2014-2015 Rocky Bernstein <[email protected]>
(require 'load-relative)
(require 'json)
diff --git a/realgud/common/track.el b/realgud/common/track.el
index 24a531d..a087615 100644
--- a/realgud/common/track.el
+++ b/realgud/common/track.el
@@ -97,6 +97,9 @@ marks set in buffer-local variables to extract text"
(if (and realgud-track-mode (realgud-cmdbuf? (current-buffer)))
(let* ((cmd-buff (current-buffer))
(cmd-mark (point-marker))
+ (shortkey
+ (realgud-cmdbuf-info-src-shortkey?
+ realgud-cmdbuf-info))
(curr-proc (get-buffer-process cmd-buff))
(cmdbuf-last-output-end
(realgud-cmdbuf-info-last-input-end realgud-cmdbuf-info))
@@ -115,7 +118,7 @@ marks set in buffer-local variables to extract text"
(realgud-cmdbuf-info-last-input-end= last-output-start)
(realgud:track-from-region last-output-start
last-output-end cmd-mark cmd-buff
- 't 't))
+ shortkey 't))
)
)
)
@@ -129,10 +132,15 @@ marks set in buffer-local variables to extract text"
(if realgud-track-mode
(lexical-let* ((cmd-buff (current-buffer))
(cmd-mark (point-marker))
- (loc (realgud:track-from-region eshell-last-output-start
- eshell-last-output-end
cmd-mark)))
- (realgud-track-loc-action loc cmd-buff 't)))
- )
+ (shortkey
+ (realgud-cmdbuf-info-src-shortkey?
+ realgud-cmdbuf-info))
+ (loc (realgud:track-from-region
+ eshell-last-output-start
+ eshell-last-output-end cmd-mark cmd-buff
+ shortkey)))
+ (realgud-track-loc-action loc cmd-buff 't shortkey))
+ ))
(defun realgud-track-term-output-filter-hook(text)
"An output-filter hook custom for ansi-term shells. Find