[811] in athena10

home help back first fref pref prev next nref lref last post

Re: /svn/athena r23280 - in trunk/athena/bin/discuss: debian edsc

daemon@ATHENA.MIT.EDU (Evan Broder)
Fri Jan 9 21:43:33 2009

Message-ID: <49680B19.6060401@mit.edu>
Date: Fri, 09 Jan 2009 21:42:33 -0500
From: Evan Broder <broder@MIT.EDU>
MIME-Version: 1.0
To: broder@mit.edu
CC: source-commits@mit.edu, athena10@mit.edu
In-Reply-To: <200901100233.VAA07970@drugstore.mit.edu>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Since that diff is completely useless, here's what I actually changed in
discuss.el:

> remus:~/athena evan$ svn diff
> svn+ssh://svn.mit.edu/athena/trunk/athena/bin/discuss/edsc/discuss.el@23279
> svn+ssh://svn.mit.edu/athena/trunk/athena/bin/discuss/edsc/discuss.el.in
> Index: discuss.el
> ===================================================================
> --- discuss.el    (.../discuss.el)    (revision 23279)
> +++ discuss.el    (.../discuss.el.in)    (revision 23280)
> @@ -21,25 +21,7 @@
>  concatenated to other file names.  Setting this to nil or an empty string
>  will cause load-path to be used.")
>  
> -; Pathname for subprocess.  Pretty gross Athena-specific hacks here.
> -
> -(defvar edsc-machine-type
> -  (let ((foo nil)
> -    (process-connection-type nil)
> -    (buf (get-buffer-create " *edsc-xyzzy*")))
> -    (save-excursion
> -      (set-buffer buf)
> -      (erase-buffer)
> -      (call-process-region (point) (point) "/bin/machtype" nil t nil)
> -      (goto-char (point-max))
> -      (delete-backward-char 1)
> -      (setq foo (buffer-string))
> -      (kill-buffer buf)
> -      (if (eq foo "")
> -      (error "Can't determine machine type.")
> -    foo)
> -      )))
> -(defvar discuss-pathname "/usr/lib/debathena-discuss/edsc"
> +(defvar discuss-pathname "#libexecdir#/edsc"
>    "*Name of program to run as slave process for discuss.")
>  
>  (defvar discuss-DWIM nil
>
> Property changes on: discuss.el
> ___________________________________________________________________
> Added: svn:mergeinfo

Removing edsc-machine-type looks fairly bold, but as far as I can tell,
it hasn't been in use since r5378. Before that revision, edsc was
provided by various lockers (including tytso's homedir for a while), and
edsc-machine-type was used as an extension to the executable path. With
that commit, edsc was moved into /usr/athena/etc/edsc. edsc-machine-type
was no longer necessary, since edsc was being found locally.

edsc-machine-type was added back in in r8260. As far as I can tell, it
was by accident, as there's no other reference to the variable in that
revision of the code. And it looks like the variable has stuck around
until now.

- Evan

home help back first fref pref prev next nref lref last post