HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename split-window-{above-each-other|split-window-side-by-side}
[bpt/emacs.git]
/
lisp
/
progmodes
/
ada-xref.el
diff --git
a/lisp/progmodes/ada-xref.el
b/lisp/progmodes/ada-xref.el
index
73c31f0
..
4a57a1e
100644
(file)
--- a/
lisp/progmodes/ada-xref.el
+++ b/
lisp/progmodes/ada-xref.el
@@
-1,7
+1,6
@@
;; ada-xref.el --- for lookup and completion in Ada mode
;; ada-xref.el --- for lookup and completion in Ada mode
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2011 Free Software Foundation, Inc.
;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
;; Rolf Ebert <ebert@inf.enst.fr>
;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
;; Rolf Ebert <ebert@inf.enst.fr>
@@
-166,7
+165,7
@@
This has the same syntax as in the project file (with variable substitution)."
Otherwise, ask the user for the name of the project file to use."
:type 'boolean :group 'ada)
Otherwise, ask the user for the name of the project file to use."
:type 'boolean :group 'ada)
-(defconst
is-windows (memq system-type (quote (windows-nt)
))
+(defconst
ada-on-ms-windows (memq system-type '(windows-nt
))
"True if we are running on Windows.")
(defcustom ada-tight-gvd-integration nil
"True if we are running on Windows.")
(defcustom ada-tight-gvd-integration nil
@@
-221,7
+220,7
@@
Used to go back to these positions.")
On Windows systems using `cmdproxy.exe' as the shell,
we need to use `/d' or the drive is never changed.")
On Windows systems using `cmdproxy.exe' as the shell,
we need to use `/d' or the drive is never changed.")
-(defvar ada-command-separator (if
i
s-windows " && " "\n")
+(defvar ada-command-separator (if
ada-on-m
s-windows " && " "\n")
"Separator to use between multiple commands to `compile' or `start-process'.
`cmdproxy.exe' doesn't recognize multiple-line commands, so we have to use
\"&&\" for now.")
"Separator to use between multiple commands to `compile' or `start-process'.
`cmdproxy.exe' doesn't recognize multiple-line commands, so we have to use
\"&&\" for now.")
@@
-324,7
+323,7
@@
CROSS-PREFIX is the prefix to use for the `gnatls' command."
(add-to-list 'ada-xref-runtime-library-specs-path
(buffer-substring-no-properties
(point)
(add-to-list 'ada-xref-runtime-library-specs-path
(buffer-substring-no-properties
(point)
- (
save-excursion (end-of-line) (point)
))))
+ (
point-at-eol
))))
(forward-line 1))
;; Object path
(forward-line 1))
;; Object path
@@
-338,7
+337,7
@@
CROSS-PREFIX is the prefix to use for the `gnatls' command."
(add-to-list 'ada-xref-runtime-library-ali-path
(buffer-substring-no-properties
(point)
(add-to-list 'ada-xref-runtime-library-ali-path
(buffer-substring-no-properties
(point)
- (
save-excursion (end-of-line) (point)
))))
+ (
point-at-eol
))))
(forward-line 1))
)
(kill-buffer nil))))
(forward-line 1))
)
(kill-buffer nil))))
@@
-767,7
+766,7
@@
is non-nil, prompt the user to select one. If none are found, return
'comp_opt ada-prj-default-comp-opt
'cross_prefix ""
'debug_cmd (concat ada-prj-default-debugger
'comp_opt ada-prj-default-comp-opt
'cross_prefix ""
'debug_cmd (concat ada-prj-default-debugger
- " ${main}" (if
i
s-windows ".exe")) ;; FIXME: don't need .exe?
+ " ${main}" (if
ada-on-m
s-windows ".exe")) ;; FIXME: don't need .exe?
'debug_post_cmd (list nil)
'debug_pre_cmd (list (concat ada-cd-command " ${build_dir}"))
'gnatmake_opt ada-prj-default-gnatmake-opt
'debug_post_cmd (list nil)
'debug_pre_cmd (list (concat ada-cd-command " ${build_dir}"))
'gnatmake_opt ada-prj-default-gnatmake-opt
@@
-781,7
+780,7
@@
is non-nil, prompt the user to select one. If none are found, return
'make_cmd (list ada-prj-default-make-cmd) ;; FIXME: should not a list
'obj_dir (list ".")
'remote_machine ""
'make_cmd (list ada-prj-default-make-cmd) ;; FIXME: should not a list
'obj_dir (list ".")
'remote_machine ""
- 'run_cmd (list (concat "./${main}" (if
i
s-windows ".exe")))
+ 'run_cmd (list (concat "./${main}" (if
ada-on-m
s-windows ".exe")))
;; FIXME: should not a list
;; FIXME: don't need .exe?
'src_dir (list ".")
;; FIXME: should not a list
;; FIXME: don't need .exe?
'src_dir (list ".")
@@
-1015,7
+1014,7
@@
existing buffer `*gnatfind*', if there is one."
;; processed (gnatfind \"+\":...).
(let* ((quote-entity
(if (= (aref entity 0) ?\")
;; processed (gnatfind \"+\":...).
(let* ((quote-entity
(if (= (aref entity 0) ?\")
- (if
i
s-windows
+ (if
ada-on-m
s-windows
(concat "\\\"" (substring entity 1 -1) "\\\"")
(concat "'\"" (substring entity 1 -1) "\"'"))
entity))
(concat "\\\"" (substring entity 1 -1) "\\\"")
(concat "'\"" (substring entity 1 -1) "\"'"))
entity))
@@
-1044,7
+1043,7
@@
existing buffer `*gnatfind*', if there is one."
(setq old-contents (buffer-string))))
(let ((compilation-error "reference"))
(setq old-contents (buffer-string))))
(let ((compilation-error "reference"))
- (compilation-start command 'compilation-mode (lambda (mode) ada-gnatfind-buffer-name)))
+ (compilation-start command 'compilation-mode (lambda (
_
mode) ada-gnatfind-buffer-name)))
;; Hide the "Compilation" menu
(with-current-buffer ada-gnatfind-buffer-name
;; Hide the "Compilation" menu
(with-current-buffer ada-gnatfind-buffer-name
@@
-1385,7
+1384,7
@@
project file."
;; Do not add -fullname, since we can have a 'rsh' command in front.
;; FIXME: This is evil but luckily a nop under Emacs-21.3.50 ! -stef
;; Do not add -fullname, since we can have a 'rsh' command in front.
;; FIXME: This is evil but luckily a nop under Emacs-21.3.50 ! -stef
- (fset 'gud-gdb-massage-args (lambda (file args) args))
+ (fset 'gud-gdb-massage-args (lambda (
_
file args) args))
(set 'pre-cmd (mapconcat 'identity pre-cmd ada-command-separator))
(if (not (equal pre-cmd ""))
(set 'pre-cmd (mapconcat 'identity pre-cmd ada-command-separator))
(if (not (equal pre-cmd ""))
@@
-1439,7
+1438,7
@@
project file."
;; is going to have some relevant information.
(if (or (not (string-match "gvd" (comint-arguments cmd 0 0)))
(string-match "--tty" cmd))
;; is going to have some relevant information.
(if (or (not (string-match "gvd" (comint-arguments cmd 0 0)))
(string-match "--tty" cmd))
- (split-window-
vertically
))
+ (split-window-
below
))
(switch-to-buffer buffer)
)))
(switch-to-buffer buffer)
)))
@@
-1817,7
+1816,7
@@
Information is extracted from the ali file."
(beginning-of-line)
(if declaration-found
(let ((current-line (buffer-substring
(beginning-of-line)
(if declaration-found
(let ((current-line (buffer-substring
- (point) (
save-excursion (end-of-line) (point)
))))
+ (point) (
point-at-eol
))))
(save-excursion
(forward-line 1)
(beginning-of-line)
(save-excursion
(forward-line 1)
(beginning-of-line)
@@
-2379,5
+2378,4
@@
For instance, it creates the gnat-specific menus, sets some hooks for
(provide 'ada-xref)
(provide 'ada-xref)
-;; arch-tag: 415a39fe-577b-4676-b3b1-6ff6db7ca24e
;;; ada-xref.el ends here
;;; ada-xref.el ends here