Mercurial > octave-nkf
changeset 10007:12dd0a7597ff
Distribute emacs specific files from emacs directory rather than examples directory
| author | Rik <rdrider0-list@yahoo.com> |
|---|---|
| date | Sun, 20 Dec 2009 00:02:46 -0800 |
| parents | 061ea41a3da7 |
| children | b6261d776a82 |
| files | ChangeLog emacs/info-emacs-info emacs/info-emacs-octave-help emacs/module.mk examples/Makefile.am examples/info-emacs-info examples/info-emacs-octave-help |
| diffstat | 7 files changed, 80 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Dec 19 23:35:29 2009 -0800 +++ b/ChangeLog Sun Dec 20 00:02:46 2009 -0800 @@ -1,3 +1,9 @@ +2009-12-19 Rik <octave@nomad.inbox5.com> + + * emacs/module.mk, examples/Makefile.am, info-emacs-info, + info-emacs-octave-help: Distribute emacs specific files from emacs + directory rather than examples directory + 2009-12-19 Rik <octave@nomad.inbox5.com> * m4/module.mk, Makefile.am: Redo previous patch with distribution
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/emacs/info-emacs-info Sun Dec 20 00:02:46 2009 -0800 @@ -0,0 +1,34 @@ +#! /bin/sh +# info-emacs-info +# +# Copyright (C) 1996, 2005, 2007 Kurt Hornik +# +# This file is part of Octave. +# +# Octave is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# Octave is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with Octave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. + +# Written by Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> on 1996/07/01 + +# Make Octave's `help -i' use Emacs info. +# Requires a running Emacs and gnuserv. +cmd="(Info-find-node \"$2\" \"Top\")" +if [ $3 = "--directory" ]; +then + cmd="(add-to-list 'Info-directory-list \"$4\") $cmd" + shift 2 +fi +cmd="(require 'info) $cmd" +[ $4 ] && cmd="$cmd (Info-index \"$4\")" +gnuclient -batch -q -eval "$cmd"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/emacs/info-emacs-octave-help Sun Dec 20 00:02:46 2009 -0800 @@ -0,0 +1,35 @@ +#! /bin/sh +# info-emacs-octave-help +# +# Copyright (C) 1996, 1997, 2005, 2007 Kurt Hornik +# +# This file is part of Octave. +# +# Octave is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# Octave is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with Octave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. + +# Written by KH <Kurt.Hornik@wu-wien.ac.at> on 1996/07/01 +# Updated by KH on 1997/03/04 + +# Make Octave's `help -i' use Emacs octave-help. +# Requires a running Emacs and gnuserv. + +cmd="(require 'octave-hlp)" +if [ $3 = "--directory" ]; +then + cmd="$cmd (add-to-list 'Info-directory-list \"$4\")" + shift 2 +fi +cmd="$cmd (octave-help \"$4\")" +gnuclient -batch -q -eval "$cmd"
--- a/emacs/module.mk Sat Dec 19 23:35:29 2009 -0800 +++ b/emacs/module.mk Sun Dec 20 00:02:46 2009 -0800 @@ -1,10 +1,15 @@ +dist_archlib_SCRIPTS = emacs/info-emacs-info emacs/info-emacs-octave-help + EXTRA_DIST += \ emacs/NEWS \ emacs/README \ emacs/TODO \ + emacs/info-emacs-info \ + emacs/info-emacs-octave-help \ emacs/module.mk \ emacs/octave-hlp.el \ emacs/octave-inf.el \ emacs/octave-mod.el \ emacs/octave-tags \ emacs/octave-tags.1 +
--- a/examples/Makefile.am Sat Dec 19 23:35:29 2009 -0800 +++ b/examples/Makefile.am Sun Dec 20 00:02:46 2009 -0800 @@ -20,8 +20,6 @@ include $(top_srcdir)/common.mk -dist_archlib_SCRIPTS = info-emacs-info info-emacs-octave-help - IMAGE_FILES = octave-sombrero.png image_DATA = $(IMAGE_FILES)
--- a/examples/info-emacs-info Sat Dec 19 23:35:29 2009 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -#! /bin/sh -# info-emacs-info -# -# Copyright (C) 1996, 2005, 2007 Kurt Hornik -# -# This file is part of Octave. -# -# Octave is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 3 of the License, or (at -# your option) any later version. -# -# Octave is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with Octave; see the file COPYING. If not, see -# <http://www.gnu.org/licenses/>. - -# Written by Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> on 1996/07/01 - -# Make Octave's `help -i' use Emacs info. -# Requires a running Emacs and gnuserv. -cmd="(Info-find-node \"$2\" \"Top\")" -if [ $3 = "--directory" ]; -then - cmd="(add-to-list 'Info-directory-list \"$4\") $cmd" - shift 2 -fi -cmd="(require 'info) $cmd" -[ $4 ] && cmd="$cmd (Info-index \"$4\")" -gnuclient -batch -q -eval "$cmd"
--- a/examples/info-emacs-octave-help Sat Dec 19 23:35:29 2009 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -#! /bin/sh -# info-emacs-octave-help -# -# Copyright (C) 1996, 1997, 2005, 2007 Kurt Hornik -# -# This file is part of Octave. -# -# Octave is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 3 of the License, or (at -# your option) any later version. -# -# Octave is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with Octave; see the file COPYING. If not, see -# <http://www.gnu.org/licenses/>. - -# Written by KH <Kurt.Hornik@wu-wien.ac.at> on 1996/07/01 -# Updated by KH on 1997/03/04 - -# Make Octave's `help -i' use Emacs octave-help. -# Requires a running Emacs and gnuserv. - -cmd="(require 'octave-hlp)" -if [ $3 = "--directory" ]; -then - cmd="$cmd (add-to-list 'Info-directory-list \"$4\")" - shift 2 -fi -cmd="$cmd (octave-help \"$4\")" -gnuclient -batch -q -eval "$cmd"