Commits

Peter Szilagyi committed 6c51f87

debugged transitional stubs

  • Participants
  • Parent commits 19b87c0
  • Tags 2012-11-23-roll-test

Comments (0)

Files changed (2)

File obsolete/jane-test/jane-common.el

-(warn "We have moved Jane Street's elisp libraries.
+(warn "
+
+We have moved Jane Street's Emacs Lisp libraries.
 
 Please change your ~/.emacs to say:
 
 
 Thanks.  --pszilagyi
 
-Sleeping for 10 seconds and then \"helping\" you edit your ~/.emacs...")
-(sleep-for 10)                          ; annoying
-(load "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-common")
-(find-file-other-window (expand-file-name "~/.emacs"))
-(query-replace "/mnt/global/\(base\|dev\)/lib/elisp/jane-test/jane-common"
-               "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-common")
+")
+(if (yes-or-no-p "Load jane-elisp? ")
+    (load "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-common"))
+;; We could do an after-init-time/after-init-hook dance here, so the
+;; user's customizations were loaded for query-replace-regexp.
+;; However, the user's ~/.emacs is likely to die in this context,
+;; where we're changing jane-elisp out from under them.  So, do
+;; query-replace-regexp now, even though the user will get an
+;; uncustomized Emacs.
+(if (yes-or-no-p "Update ~/.emacs? ")
+    (progn (find-file (expand-file-name "~/.emacs"))
+           (goto-char (point-min))      ; point may be saved
+           (query-replace-regexp
+            "/mnt/global/\\(base\\|dev\\)/lib/elisp/jane-test/jane-common"
+            "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-common")))

File obsolete/jane-test/jane-defaults.el

-(warn "We have moved Jane Street's elisp libraries.
+(warn "
+
+We have moved Jane Street's Emacs Lisp libraries.
 
 Please change your ~/.emacs to say:
 
 
 Thanks.  --pszilagyi
 
-Sleeping for 10 seconds and then \"helping\" you edit your ~/.emacs...")
-(sleep-for 10)                          ; annoying
-(load "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-defaults")
-(find-file-other-window (expand-file-name "~/.emacs"))
-(query-replace "/mnt/global/\(base\|dev\)/lib/elisp/jane-test/jane-defaults"
-               "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-defaults")
+")
+(if (yes-or-no-p "Load jane-elisp? ")
+    (load "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-defaults"))
+;; We could do an after-init-time/after-init-hook dance here, so the
+;; user's customizations were loaded for query-replace-regexp.
+;; However, the user's ~/.emacs is likely to die in this context,
+;; where we're changing jane-elisp out from under them.  So, do
+;; query-replace-regexp now, even though the user will get an
+;; uncustomized Emacs.
+(if (yes-or-no-p "Update ~/.emacs? ")
+    (progn (find-file (expand-file-name "~/.emacs"))
+           (goto-char (point-min))      ; point may be saved
+           (query-replace-regexp
+            "/mnt/global/\\(base\\|dev\\)/lib/elisp/jane-test/jane-defaults"
+            "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-defaults")))