;; Set site lisp dir for everyone and add load paths ;;
-(defvar jane-jane-lisp ; this directory
- (if load-file-name (directory-file-name (file-name-directory load-file-name))))
+ (file-truename (expand-file-name "."
+ (file-name-directory (or load-file-name
+ "The absolute name of this elisp/jane directory, with symlinks resolved.
+Symlinks are resolved in order to fix the version of the Jane
+Elisp code for the life of this Emacs. The Jane Elisp code is
+usually installed in a date-stamped location and symlinked from
+an official name for the latest version.
+For example, a user typically has this in ~/.emacs:
+ (load \"/j/office/app/emacs/prod/jane-elisp/elisp/jane/jane-defaults\")
+The \"jane-elisp\" component is typically a symlink, like this:
+ jane-elisp -> .sink-2012-12-03_22-11-48.277942/jane-elisp
+By expanding paths to use the long, ugly, versioned directory
+name, already running Emacsen will continue to work after
+jane-elisp upgrades, using their start-time version. Even when
+an upgrade moves the OMake Server executable or increments its
+protocol version, users won't have to restart immediately.")
(defvar jane-contrib-lisp (expand-file-name "../contrib" jane-jane-lisp)
"The location of Emacs libraries")
(defconst jane-home (expand-file-name "../.." jane-jane-lisp))
-;; CR pszilagyi: The following can be removed after we've eradicated
-;; these settings from users' ~/.emacs files, which were set by the
-;; old jane-common.el and saved by Custom:
-;; ((quote prod) "/mnt/global/base/bin/omake_server.exe")
-;; ((quote test) "/mnt/global/base/bin/omake_server_test.exe")
-;; ((quote local) (expand-file-name "ocaml/omake/omake_server.exe" jane-home))))
-;; The above fragment is evaluated by Custom and references
-;; `jane-mode'. One way to get rid of this is for the user to Erase
-;; Customizations in the Customize buffer.
-(defconst jane-mode 'local)
"elisp/contrib" ; incl. ert 2012
(add-to-list 'load-path (expand-file-name dir jane-home)))
-;; Ocp.indent-program defaults to ../../ocp-indent/ocp-indent-stdin,
-;; which runs ocp-indent from $PATH. If the user or site doesn't have
+;; If the user or site doesn't have
;; their own ocp-indent, find the one included with jane-elisp.
(let ((bin (expand-file-name "../../bin" jane-jane-lisp)))
(add-to-list 'exec-path bin 'append)