--- aplus-fsf-4.20/src/lisp.1/a.el.org 2001-03-09 22:20:08.000000000 +0100
+++ aplus-fsf-4.20/src/lisp.1/a.el 2006-08-13 20:10:08.000000000 +0200
@@ -26,7 +26,7 @@
(defvar a+-font "kaplscreen-bold" "Font used in A+ mode.")
-; (defvar apr-command "/usr/local/bin/apr" "Command to print A+ code")
+; (defvar apr-command "/usr/bin/apr" "Command to print A+ code")
; (defvar apr-command "/ms/dist/aurora/bin/apr" "Command to print A+ code")
(defvar old-lpr-command lpr-command)
@@ -411,7 +411,7 @@
(concat prompt "[" defval "]: "))) ""))
defval arg))
-(defvar a-prog "/usr/local/bin/a" "*Program to run for `a' command")
+(defvar a-prog "/usr/bin/a+" "*Program to run for `a' command")
(defvar a-log "~/.emacs_a" "*Log file for `a' sessions")
(defvar a-tmp-dir "~" "Temp directory for A+ xemacs operations")
(defvar a-init-string "$echo `date` on `hostname`\n" "*Sent to `a' on startup")
@@ -435,7 +435,7 @@
(defun standard-a()
(interactive)
- (setq a-prog "/usr/local/bin/z")
+ (setq a-prog "/usr/bin/a+")
(setq a-log "~/.emacs_a")
(setq a-tmp-dir "~")
(setq a-init-string "$echo `date` on `hostname`\n")
@@ -874,7 +874,7 @@
(defvar a-prog-default "a+")
-(defvar a-path-default "/usr/local/lib/aplus-")
+(defvar a-path-default "/usr/lib/a+")
;(cond ((string-equal (getenv "SYS_FIRIS") "FID")
; (defvar a-path-default "/usr/local/a+_")
@@ -905,28 +905,28 @@
(cond
; a+_1a 1a
((string-match "^\\(a\\+_\\)?\\([0-9]+a\\)$" arg)
- (build-prog-name a-path-default "/bin/a+" arg 2))
+ (build-prog-name a-path-default "/usr/bin/a+" arg 2))
; a+_1b1 1b1
((string-match "^\\(a\\+_\\)?\\([0-9]+b[0-9]+\\)$" arg)
- (build-prog-name a-path-default "/bin/a+" arg 2))
+ (build-prog-name a-path-default "/usr/bin/a+" arg 2))
; a+_1.01 1.01
((string-match "^\\(a\\+_\\)?\\([0-9]+\\.[0-9]+\\)$" arg)
- (build-prog-name a-path-default "/bin/a+" arg 2))
+ (build-prog-name a-path-default "/usr/bin/a+" arg 2))
; a aX a_82 aX_82 a_latest aX_latest
((string-match "^a\\(X\\)?\\(_[0-9a-zA-Z]+\\)?$" arg)
(progn
(setq a-plus nil)
(concat
- "/usr/local/bin/a"
+ "/usr/bin/a"
(if (match-beginning 1) "X")
(if (match-beginning 2)
(substring arg (match-beginning 2) (match-end 2))))))
; a+_m1.maus m1.maus
((string-match "^\\(a\\+_\\)?m\\([0-9]+\\)\\.\\([a-z]+\\)$" arg)
(build-prog-name
- "/u/src/usr/local/a+_"
+ "/usr/bin/a+_"
(concat "/" (substring arg (match-beginning 3) (match-end 3))
- "/" (getenv "ID_EXEC") "/bin/a+")
+ "/" (getenv "ID_EXEC") "/usr/bin/a+")
arg 2))
; a+_m1 m1
((string-match "^\\(a\\+_\\)?m\\([0-9]+\\)$" arg)
@@ -943,7 +943,7 @@
(concat "/u/aplus/" (getenv "ID_EXEC") "/bin/a+"))
; a+ a+_1
((string-match "^a\\+\\(_[0-9]+\\)?$" arg)
- (concat "/usr/local/a+"
+ (concat "/usr/lib/a+"
(if (match-beginning 1)
(substring arg (match-beginning 1) (match-end 1)))
"/bin/a+"))
@@ -951,12 +951,12 @@
((string-match "^\\([0-9]+\\)$" arg)
(concat a-path-default arg "/bin/a+"))
; ont
- ((string-match "^ont$" arg) "/usr/local/a+_ont/bin/a+")
+ ((string-match "^ont$" arg) "/usr/bin/a+")
; default
- ((string-match "^default$" arg) "/ms/dist/aplus/bin/a+")
+ ((string-match "^default$" arg) "/usr/bin/a+")
; x.latest
((string-match "^\\([0-9]+.latest\\)$" arg)
- (concat a-path-default arg "/bin/a+"))
+ (concat a-path-default arg "/usr/bin/a+"))
; anything else
(t arg )))
"\""))))
--- aplus-fsf-4.20/src/lisp.1/aplus.el.org 2005-08-29 04:22:56.000000000 +0200
+++ aplus-fsf-4.20/src/lisp.1/aplus.el 2006-08-13 20:04:41.000000000 +0200
@@ -32,7 +32,7 @@
(if aplus-set-load-path
(setq load-path
(append
- '("/usr/local/aplus-fsf-4.20/lisp.1") load-path
+ '("/usr/share/xemacs/site-packages/lisp/aplus-fsf/") load-path
)
))
;;
@@ -47,7 +47,7 @@
(require 'a-font)
(require 'keyb)
(require 'a)
-(setq a-prog "/usr/local/bin/a+")
+(setq a-prog "/usr/bin/a+")
(setq a-plus t)
(cond ((file-readable-p "~/.custom/a-options.el")
