diff options
| author | Karoly Lorentey | 2004-11-13 18:34:40 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-11-13 18:34:40 +0000 |
| commit | e417405015c93c81641f5c4a33ec898b5c353772 (patch) | |
| tree | 017a980c35c8a71c372304418d151e3826f88636 /lisp/progmodes | |
| parent | f590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (diff) | |
| parent | 68d1b30d251b4771f739d20f507cd9523ae3919b (diff) | |
| download | emacs-e417405015c93c81641f5c4a33ec898b5c353772.tar.gz emacs-e417405015c93c81641f5c4a33ec898b5c353772.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/ada-xref.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 13 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 12 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-shell.el | 31 |
5 files changed, 32 insertions, 28 deletions
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 472cfc3053e..e7eb0657eac 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el | |||
| @@ -1292,7 +1292,7 @@ If ARG is non-nil, ask the user to confirm the command." | |||
| 1292 | 1292 | ||
| 1293 | ;; Move to the end of the debugger buffer, so that it is automatically | 1293 | ;; Move to the end of the debugger buffer, so that it is automatically |
| 1294 | ;; scrolled from then on. | 1294 | ;; scrolled from then on. |
| 1295 | (end-of-buffer) | 1295 | (goto-char (point-max)) |
| 1296 | 1296 | ||
| 1297 | ;; Display both the source window and the debugger window (the former | 1297 | ;; Display both the source window and the debugger window (the former |
| 1298 | ;; above the latter). No need to show the debugger window unless it | 1298 | ;; above the latter). No need to show the debugger window unless it |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 223455e9872..034cdaf5fdd 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -785,11 +785,14 @@ the function in `compilation-buffer-name-function', so you can set that | |||
| 785 | to a function that generates a unique name." | 785 | to a function that generates a unique name." |
| 786 | (interactive | 786 | (interactive |
| 787 | (list | 787 | (list |
| 788 | (if (or compilation-read-command current-prefix-arg) | 788 | (let ((command (eval compile-command))) |
| 789 | (read-from-minibuffer "Compile command: " | 789 | (if (or compilation-read-command current-prefix-arg) |
| 790 | (eval compile-command) nil nil | 790 | (read-from-minibuffer "Compile command: " |
| 791 | '(compile-history . 1)) | 791 | command nil nil |
| 792 | (eval compile-command)) | 792 | (if (equal (car compile-history) command) |
| 793 | '(compile-history . 1) | ||
| 794 | 'compile-history)) | ||
| 795 | command)) | ||
| 793 | (consp current-prefix-arg))) | 796 | (consp current-prefix-arg))) |
| 794 | (unless (equal command (eval compile-command)) | 797 | (unless (equal command (eval compile-command)) |
| 795 | (setq compile-command command)) | 798 | (setq compile-command command)) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 94458df56e8..38cc167d942 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -5292,7 +5292,7 @@ Customized by setting variables `cperl-shrink-wrap-info-frame', | |||
| 5292 | iniwin (selected-window) | 5292 | iniwin (selected-window) |
| 5293 | fr1 (window-frame iniwin)) | 5293 | fr1 (window-frame iniwin)) |
| 5294 | (set-buffer buf) | 5294 | (set-buffer buf) |
| 5295 | (beginning-of-buffer) | 5295 | (goto-char (point-min)) |
| 5296 | (or isvar | 5296 | (or isvar |
| 5297 | (progn (re-search-forward "^-X[ \t\n]") | 5297 | (progn (re-search-forward "^-X[ \t\n]") |
| 5298 | (forward-line -1))) | 5298 | (forward-line -1))) |
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 74368661d3e..cf2b0797e82 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el | |||
| @@ -60,6 +60,7 @@ | |||
| 60 | (defvar gdb-previous-address nil) | 60 | (defvar gdb-previous-address nil) |
| 61 | (defvar gdb-previous-frame nil) | 61 | (defvar gdb-previous-frame nil) |
| 62 | (defvar gdb-current-frame nil) | 62 | (defvar gdb-current-frame nil) |
| 63 | (defvar gdb-current-stack-level nil) | ||
| 63 | (defvar gdb-current-language nil) | 64 | (defvar gdb-current-language nil) |
| 64 | (defvar gdb-view-source t "Non-nil means that source code can be viewed.") | 65 | (defvar gdb-view-source t "Non-nil means that source code can be viewed.") |
| 65 | (defvar gdb-selected-view 'source "Code type that user wishes to view.") | 66 | (defvar gdb-selected-view 'source "Code type that user wishes to view.") |
| @@ -183,6 +184,7 @@ detailed description of this mode. | |||
| 183 | (setq gdb-previous-address nil) | 184 | (setq gdb-previous-address nil) |
| 184 | (setq gdb-previous-frame nil) | 185 | (setq gdb-previous-frame nil) |
| 185 | (setq gdb-current-frame nil) | 186 | (setq gdb-current-frame nil) |
| 187 | (setq gdb-current-stack-level nil) | ||
| 186 | (setq gdb-view-source t) | 188 | (setq gdb-view-source t) |
| 187 | (setq gdb-selected-view 'source) | 189 | (setq gdb-selected-view 'source) |
| 188 | (setq gdb-var-list nil) | 190 | (setq gdb-var-list nil) |
| @@ -393,7 +395,8 @@ detailed description of this mode. | |||
| 393 | "If non-nil highlight values that have recently changed in the speedbar. | 395 | "If non-nil highlight values that have recently changed in the speedbar. |
| 394 | The highlighting is done with `font-lock-warning-face'." | 396 | The highlighting is done with `font-lock-warning-face'." |
| 395 | :type 'boolean | 397 | :type 'boolean |
| 396 | :group 'gud) | 398 | :group 'gud |
| 399 | :version "21.4") | ||
| 397 | 400 | ||
| 398 | (defun gdb-speedbar-expand-node (text token indent) | 401 | (defun gdb-speedbar-expand-node (text token indent) |
| 399 | "Expand the node the user clicked on. | 402 | "Expand the node the user clicked on. |
| @@ -1291,9 +1294,8 @@ static char *magick[] = { | |||
| 1291 | '(mouse-face highlight | 1294 | '(mouse-face highlight |
| 1292 | help-echo "mouse-2, RET: Select frame")) | 1295 | help-echo "mouse-2, RET: Select frame")) |
| 1293 | (beginning-of-line) | 1296 | (beginning-of-line) |
| 1294 | (when (and (or (looking-at "^#[0-9]*\\s-*\\S-* in \\(\\S-*\\)") | 1297 | (when (and (looking-at "^#\\([0-9]+\\)") |
| 1295 | (looking-at "^#[0-9]*\\s-*\\(\\S-*\\)")) | 1298 | (equal (match-string 1) gdb-current-stack-level)) |
| 1296 | (equal (match-string 1) gdb-current-frame)) | ||
| 1297 | (put-text-property (point-at-bol) (point-at-eol) | 1299 | (put-text-property (point-at-bol) (point-at-eol) |
| 1298 | 'face '(:inverse-video t))) | 1300 | 'face '(:inverse-video t))) |
| 1299 | (forward-line 1)))))) | 1301 | (forward-line 1)))))) |
| @@ -2047,6 +2049,8 @@ BUFFER nil or omitted means use the current buffer." | |||
| 2047 | (delq 'gdb-get-current-frame gdb-pending-triggers)) | 2049 | (delq 'gdb-get-current-frame gdb-pending-triggers)) |
| 2048 | (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer) | 2050 | (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer) |
| 2049 | (goto-char (point-min)) | 2051 | (goto-char (point-min)) |
| 2052 | (if (looking-at "Stack level \\([0-9]+\\)") | ||
| 2053 | (setq gdb-current-stack-level (match-string 1))) | ||
| 2050 | (forward-line) | 2054 | (forward-line) |
| 2051 | (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ") | 2055 | (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ") |
| 2052 | (progn | 2056 | (progn |
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 692fce0234e..6720014ed31 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el | |||
| @@ -508,11 +508,19 @@ the expression output by IDL." | |||
| 508 | (defvar comint-last-input-start) | 508 | (defvar comint-last-input-start) |
| 509 | (defvar comint-last-input-end) | 509 | (defvar comint-last-input-end) |
| 510 | 510 | ||
| 511 | (defvar idlwave-shell-temp-pro-file nil | ||
| 512 | "Absolute pathname for temporary IDL file for compiling regions") | ||
| 513 | |||
| 514 | (defvar idlwave-shell-temp-rinfo-save-file nil | ||
| 515 | "Absolute pathname for temporary IDL file save file for routine_info. | ||
| 516 | This is used to speed up the reloading of the routine info procedure | ||
| 517 | before use by the shell.") | ||
| 518 | |||
| 511 | (defun idlwave-shell-temp-file (type) | 519 | (defun idlwave-shell-temp-file (type) |
| 512 | "Return a temp file, creating it if necessary. | 520 | "Return a temp file, creating it if necessary. |
| 513 | 521 | ||
| 514 | TYPE is either 'pro or 'rinfo, and idlwave-shell-temp-pro-file or | 522 | TYPE is either `pro' or `rinfo', and `idlwave-shell-temp-pro-file' or |
| 515 | idlwave-shell-temp-rinfo-save-file is set (respectively)." | 523 | `idlwave-shell-temp-rinfo-save-file' is set (respectively)." |
| 516 | (cond | 524 | (cond |
| 517 | ((eq type 'rinfo) | 525 | ((eq type 'rinfo) |
| 518 | (or idlwave-shell-temp-rinfo-save-file | 526 | (or idlwave-shell-temp-rinfo-save-file |
| @@ -550,17 +558,6 @@ idlwave-shell-temp-rinfo-save-file is set (respectively)." | |||
| 550 | nil) | 558 | nil) |
| 551 | file))) | 559 | file))) |
| 552 | 560 | ||
| 553 | ;; Other variables | ||
| 554 | (defvar idlwave-shell-temp-pro-file | ||
| 555 | nil | ||
| 556 | "Absolute pathname for temporary IDL file for compiling regions") | ||
| 557 | |||
| 558 | (defvar idlwave-shell-temp-rinfo-save-file | ||
| 559 | nil | ||
| 560 | "Absolute pathname for temporary IDL file save file for routine_info. | ||
| 561 | This is used to speed up the reloading of the routine info procedure | ||
| 562 | before use by the shell.") | ||
| 563 | |||
| 564 | (defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur" | 561 | (defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur" |
| 565 | "Command used by `idlwave-shell-resync-dirs' to query IDL for | 562 | "Command used by `idlwave-shell-resync-dirs' to query IDL for |
| 566 | the directory stack.") | 563 | the directory stack.") |
| @@ -2523,6 +2520,10 @@ idlw-shell-examine-alist from which to select the help command text." | |||
| 2523 | (defvar idlwave-shell-examine-window-alist nil | 2520 | (defvar idlwave-shell-examine-window-alist nil |
| 2524 | "Variable to hold the win/height pairs for all *Examine* windows.") | 2521 | "Variable to hold the win/height pairs for all *Examine* windows.") |
| 2525 | 2522 | ||
| 2523 | (defvar idlwave-shell-examine-map (make-sparse-keymap)) | ||
| 2524 | (define-key idlwave-shell-examine-map "q" 'idlwave-shell-examine-display-quit) | ||
| 2525 | (define-key idlwave-shell-examine-map "c" 'idlwave-shell-examine-display-clear) | ||
| 2526 | |||
| 2526 | (defun idlwave-shell-examine-display () | 2527 | (defun idlwave-shell-examine-display () |
| 2527 | "View the examine command output in a separate buffer." | 2528 | "View the examine command output in a separate buffer." |
| 2528 | (let (win cur-beg cur-end) | 2529 | (let (win cur-beg cur-end) |
| @@ -2603,10 +2604,6 @@ idlw-shell-examine-alist from which to select the help command text." | |||
| 2603 | (skip-chars-backward "\n") | 2604 | (skip-chars-backward "\n") |
| 2604 | (recenter -1))))) | 2605 | (recenter -1))))) |
| 2605 | 2606 | ||
| 2606 | (defvar idlwave-shell-examine-map (make-sparse-keymap)) | ||
| 2607 | (define-key idlwave-shell-examine-map "q" 'idlwave-shell-examine-display-quit) | ||
| 2608 | (define-key idlwave-shell-examine-map "c" 'idlwave-shell-examine-display-clear) | ||
| 2609 | |||
| 2610 | (defun idlwave-shell-examine-display-quit () | 2607 | (defun idlwave-shell-examine-display-quit () |
| 2611 | (interactive) | 2608 | (interactive) |
| 2612 | (let ((win (selected-window))) | 2609 | (let ((win (selected-window))) |