gnuplot-mode (1:0.6.0-5) debian-dir only changes

Summary

 debian/README.source                                            |    7 
 debian/changelog                                                |  152 ++++++++++
 debian/compat                                                   |    1 
 debian/control                                                  |   26 +
 debian/copyright                                                |   30 +
 debian/dirs                                                     |    6 
 debian/docs                                                     |    4 
 debian/emacsen-install                                          |   39 ++
 debian/emacsen-remove                                           |   15 
 debian/emacsen-startup                                          |   31 ++
 debian/info                                                     |    1 
 debian/patches/00list                                           |    3 
 debian/patches/500_gnuplot.el_make-variable-buffer-local.dpatch |   28 +
 debian/patches/850_gnuplot.el_fix-obsolete-backquotes.dpatch    |   50 +++
 debian/patches/900_gnuplot.el_fix_indentation.dpatch            |   45 ++
 debian/rules                                                    |   67 ++++
 16 files changed, 505 insertions(+)

    
download this patch

Patch contents

--- gnuplot-mode-0.6.0.orig/debian/rules
+++ gnuplot-mode-0.6.0/debian/rules
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+build-stamp: patch-stamp
+	dh_testdir
+
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	# Add here commands to compile the package.
+	#$(MAKE)
+
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	#$(MAKE) install prefix=`pwd`/debian/tmp/usr
+	cp gnuplot.el $(CURDIR)/debian/gnuplot-mode/usr/share/emacs/site-lisp/gnuplot-mode
+	cp gnuplot-gui.el $(CURDIR)/debian/gnuplot-mode/usr/share/emacs/site-lisp/gnuplot-mode
+	cp info-look.20.3.el $(CURDIR)/debian/gnuplot-mode/usr/share/emacs/site-lisp/gnuplot-mode
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installemacsen
+	dh_installman
+	dh_installchangelogs ChangeLog
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# Nothing to do here. This package is arch all
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched
--- gnuplot-mode-0.6.0.orig/debian/control
+++ gnuplot-mode-0.6.0/debian/control
@@ -0,0 +1,26 @@
+Source: gnuplot-mode
+Section: math
+Priority: optional
+Maintainer: Vincent Fourmond <fourmond@debian.org>
+Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
+Standards-Version: 3.8.4
+Vcs-Git: git://git.debian.org/git/users/fourmond/packages/gnuplot-mode.git
+Vcs-Browser: http://git.debian.org/?p=users/fourmond/packages/gnuplot-mode.git
+Homepage: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
+
+
+Package: gnuplot-mode
+Architecture: all
+Depends: emacs23 | emacs22 | xemacs21 | emacsen, gnuplot-nox | gnuplot-x11,
+	 ${misc:Depends}
+Description: Yet another Gnuplot mode for Emacs
+ Gnuplot is a major mode for Emacs flavours with the following features:
+  - Functions for plotting lines, regions, entire scripts, or entire files
+  - Graphical interface to setting command arguments
+  - Syntax colorization
+  - Completion of common words in Gnuplot
+  - Code indentation
+  - On-line help using Info for Gnuplot functions and features
+  - Interaction with Gnuplot using comint
+  - Pull-down menus plus a toolbar in XEmacs
+  - Distributed with a quick reference sheet in postscript.
--- gnuplot-mode-0.6.0.orig/debian/README.source
+++ gnuplot-mode-0.6.0/debian/README.source
@@ -0,0 +1,7 @@
+This package uses dpatch to manage all modifications to the upstream
+source. See /usr/share/doc/dpatch/README.source.gz to get more information
+on how to use it.
+
+ -- Vincent Fourmond <fourmond@debian.org>  Mon, 13 Oct 2008 20:54:27 +0200
+
+
--- gnuplot-mode-0.6.0.orig/debian/copyright
+++ gnuplot-mode-0.6.0/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Ryuichi Arafune <arafune@debian.org> on
+Tue, 28 Mar 2000 13:23:58 +0900.
+
+It was downloaded from 
+  http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
+
+Upstream Author: Bruce Ravel <ravel@phys.washington.edu>
+
+Copyright: 1998-2002 Bruce Ravel
+
+  This program 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 2 of the License, or
+  (at your option) any later version.
+
+  This program 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 this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301 USA.
+
+
+In Debian system, You can find the full text of the GNU General Public
+licences version 2 and 3 in /usr/share/common-licenses/GPL-2 and
+/usr/share/common-licenses/GPL-3
+
--- gnuplot-mode-0.6.0.orig/debian/docs
+++ gnuplot-mode-0.6.0/debian/docs
@@ -0,0 +1,4 @@
+README
+gpelcard.tex
+gpelcard.pdf
+
--- gnuplot-mode-0.6.0.orig/debian/changelog
+++ gnuplot-mode-0.6.0/debian/changelog
@@ -0,0 +1,152 @@
+gnuplot-mode (1:0.6.0-5) unstable; urgency=low
+
+  * patches/900_gnuplot.el_fix_indentation to fix indentation (closes:
+    #554964)
+  * Add dependency on ${misc:Depends} to take care of possible dh-induced
+    dependencies
+  * Conforms to standards 3.8.4
+
+ -- Vincent Fourmond <fourmond@debian.org>  Mon, 01 Feb 2010 22:28:40 +0100
+
+gnuplot-mode (1:0.6.0-4) unstable; urgency=low
+
+  * Do not ignore any flavor of emacs by default (closes: #540810)
+  * Now conforms to standards 3.8.3
+  * Choose emacs23 as first choice for dependencies
+  * Bump debhelper compatibility level
+
+ -- Vincent Fourmond <fourmond@debian.org>  Mon, 17 Aug 2009 21:11:42 +0200
+
+gnuplot-mode (1:0.6.0-3) unstable; urgency=low
+
+  * New maintainer (closes: 503549). Many thanks to Ryuichi Arafune for 
+    maintaining gnuplot-mode before and Agustin Martin Domingo and 
+    Romain Francoise for their NMUs
+  * Using a git repository for tracking
+  * Added a Homepage field
+  * Added a debian/README.source file, so that package now conforms to
+    standards 3.8.0
+  * Clarified debian/copyright to actually include a copyright notice
+  * Fixed upstream's download location in debian/copyright
+  * Adding emacs22 | xemacs21 as an alternative to the virtual package
+    emacsen
+
+ -- Vincent Fourmond <fourmond@debian.org>  Wed, 18 Feb 2009 00:28:06 +0100
+
+gnuplot-mode (1:0.6.0-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/{compat,rules} use compat file and raise level.
+  * debian/rules:
+    - Move package build debhelper commands to build-indep
+    - Add dpatch support.
+    - Remove some unneeded commands.
+  * debian/control:
+    - Raise debhelper dependency and add dpatch one.
+    - Raised Standards value.
+  * debian/emacsen-startup:
+    - Fix regexp (Closes: #446172).
+    - Use debian-pkg-add-load-path-item
+  * debian/conffiles: Removed, dh_installemacsen will take care.
+  * debian/{postinst,prerm}: Removed. debhelper will take care.
+  * debian/copyright: Fixed copyright version.
+  * debian/patches/500_gnuplot.el_make-variable-buffer-local.dpatch (new):
+    - No need to explicitly set buffer-local font-lock-defaults,
+      it will automatically be set (Closes: #384977).
+  * debian/patches/850_gnuplot.el_fix-obsolete-backquotes.dpatch (new):
+    - Do not use obsolete old-style backquotes and ',' markers
+      (Closes: #451942).
+
+ -- Agustin Martin Domingo <agmartin@debian.org>  Mon, 19 Nov 2007 14:34:42 +0100
+
+gnuplot-mode (1:0.6.0-2.2) unstable; urgency=low
+
+  * Non-Maintainer upload.
+  * debian/emacsen-install:
+    - Support emacs22 (Closes: #432185).
+    - Set symlinks to .el files and do not load site files
+      when byte-compiling (Closes: #401687).
+    - Reorganize script for clarity.
+  * debian/control:
+    - debhelper should be in Build-Depends, not Build-Depends-Indep.
+  * debian/rules:
+    - Do not blindly ignore make clean error if a makefile is available.
+  * debian/changelog:
+    - Remove trailing whitespace
+    - Remove obsolete Local Variables section.
+
+ -- Agustin Martin Domingo <agmartin@debian.org>  Fri, 16 Nov 2007 13:20:01 +0100
+
+gnuplot-mode (1:0.6.0-2.1) unstable; urgency=low
+
+  * NMU
+  * debian/emacsen-install: Support emacs-snapshot (closes: #341285, #348878).
+
+ -- Romain Francoise <rfrancoise@debian.org>  Thu, 19 Jan 2006 17:59:40 +0100
+
+gnuplot-mode (1:0.6.0-2) unstable; urgency=low
+
+  * Change dependency due to the gnuplot package separation. closes: #312294
+
+ -- Ryuichi Arafune <arafune@debian.org>  Tue,  7 Jun 2005 16:07:37 +0900
+
+gnuplot-mode (1:0.6.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * closes: fix typo in Description. closes: #203487
+
+ -- Ryuichi Arafune <arafune@debian.org>  Thu, 31 Jul 2003 11:14:49 +0900
+
+gnuplot-mode (1:0.5r-1) unstable; urgency=low
+
+  * New upstream version.
+  * Not globally bind the [f9] key.  closes: #154435
+
+ -- Ryuichi Arafune <arafune@debian.org>  Tue, 30 Jul 2002 18:47:19 +0900
+
+gnuplot-mode (1:0.5q-2) unstable; urgency=low
+
+  * 50gnuplot-mode.el as conffile.  closes: #132205
+
+ -- Ryuichi Arafune <arafune@debian.org>  Mon,  4 Feb 2002 21:10:21 +0900
+
+gnuplot-mode (1:0.5q-1) unstable; urgency=low
+
+  * new upstream verion.
+
+ -- Ryuichi Arafune <arafune@debian.org>  Tue, 17 Jul 2001 19:06:39 +0900
+
+gnuplot-mode (1:0.5n-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Ryuichi Arafune <arafune@debian.org>  Wed, 31 Jan 2001 11:29:48 +0900
+
+gnuplot-mode (1:0.5k-2) unstable; urgency=low
+
+  * (control) Revise Depends:emacsen, gnuplot
+  closes: #70885
+
+ -- Ryuichi Arafune <arafune@debian.org>  Sat,  9 Sep 2000 16:43:43 +0900
+
+gnuplot-mode (1:0.5k-1) unstable; urgency=low
+
+  * This is *not* Debian Native Packages.
+  closes: #64849.
+
+ -- Ryuichi Arafune <arafune@debian.org>  Mon,  7 Aug 2000 12:46:54 +0900
+
+gnuplot-mode (0.5k-2) unstable; urgency=low
+
+  * Follow the policy 6.6.
+  (copyrgith) Add a pointer to /usr/share/common/licences/GPL
+
+ -- Ryuichi Arafune <arafune@debian.org>  Sat,  8 Apr 2000 09:30:01 +0900
+
+gnuplot-mode (0.5k-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ryuichi Arafune <arafune@debian.org>  Tue, 28 Mar 2000 13:23:58 +0900
+
+
--- gnuplot-mode-0.6.0.orig/debian/emacsen-startup
+++ gnuplot-mode-0.6.0/debian/emacsen-startup
@@ -0,0 +1,31 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux gnuplot-mode package
+;;
+;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
+;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
+
+;; The gnuplot-mode package follows the Debian/GNU Linux 'emacsen' policy and
+;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
+;; xemacs19, emacs20, xemacs20...).  The compiled code is then
+;; installed in a subdirectory of the respective site-lisp directory.
+;; We have to add this to the load-path:
+
+(debian-pkg-add-load-path-item
+ (concat "/usr/share/"
+	 (symbol-name debian-emacs-flavor)
+	 "/site-lisp/gnuplot-mode"))
+
+;; these lines enable the use of gnuplot mode
+  (autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t)
+  (autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot mode" t)
+
+;; this line automatically causes all files with the .gp extension to
+;; be loaded into gnuplot mode
+  (setq auto-mode-alist (append '(("\\.gp\\'" . gnuplot-mode)) auto-mode-alist))
+
+;; This line binds the function-9 key so that it opens a buffer into
+;; gnuplot mode
+;;  (global-set-key [(f9)] 'gnuplot-make-buffer)
+
--- gnuplot-mode-0.6.0.orig/debian/compat
+++ gnuplot-mode-0.6.0/debian/compat
@@ -0,0 +1 @@
+5
--- gnuplot-mode-0.6.0.orig/debian/info
+++ gnuplot-mode-0.6.0/debian/info
@@ -0,0 +1 @@
+gnuplot.info
--- gnuplot-mode-0.6.0.orig/debian/emacsen-install
+++ gnuplot-mode-0.6.0/debian/emacsen-install
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/gnuplot-mode
+
+# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
+
+FLAVOR=$1
+PACKAGE=gnuplot-mode
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+SITEFLAG="-no-site-file"      # Do not load site files when byte-compiling
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+install -m 0755 -d ${ELCDIR}
+
+cd ${ELDIR}
+FILES=`echo *.el`
+
+cd ${ELCDIR}
+for i in $FILES; do
+    ln -sf ${ELDIR}/$i .
+done
+
+cat << EOF > path.el
+    (setq load-path (cons "." load-path) byte-compile-warnings nil)
+    (require 'font-lock)
+    (defun hilit-repaint-command (foo))
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f path.el
+
+exit 0
--- gnuplot-mode-0.6.0.orig/debian/dirs
+++ gnuplot-mode-0.6.0/debian/dirs
@@ -0,0 +1,6 @@
+usr/bin
+usr/sbin
+usr/share/doc
+usr/share/doc/gnuplot-mode
+usr/share/emacs/site-lisp/gnuplot-mode
+
--- gnuplot-mode-0.6.0.orig/debian/emacsen-remove
+++ gnuplot-mode-0.6.0/debian/emacsen-remove
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/gnuplot-mode
+
+FLAVOR=$1
+PACKAGE=gnuplot-mode
+
+if [ ${FLAVOR} != emacs ]; then
+#    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+#        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/gnuplot-mode.info.gz
+#    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
--- gnuplot-mode-0.6.0.orig/debian/patches/500_gnuplot.el_make-variable-buffer-local.dpatch
+++ gnuplot-mode-0.6.0/debian/patches/500_gnuplot.el_make-variable-buffer-local.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 500_gnuplot.el_make-variable-buffer-local.dpatch by Agustin Martin Domingo <agmartin@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixing a make-variable-buffer-local into a function
+
+font-lock-defaults is already buffer-local when set in any fashion.
+
+@DPATCH@
+diff -urNad gnuplot-mode-0.6.0~/gnuplot.el gnuplot-mode-0.6.0/gnuplot.el
+--- gnuplot-mode-0.6.0~/gnuplot.el	2002-12-13 22:40:51.000000000 +0100
++++ gnuplot-mode-0.6.0/gnuplot.el	2007-11-16 16:25:41.000000000 +0100
+@@ -1837,7 +1837,6 @@
+   ;;(if (not (fboundp 'hilit-set-mode-patterns))
+   (if (featurep 'font-lock)
+       (progn
+-	(make-variable-buffer-local 'font-lock-defaults)
+ 	(setq font-lock-defaults '(gnuplot-font-lock-keywords t t))
+ 	(if gnuplot-xemacs-p (turn-on-font-lock))))
+   ;;(if (featurep 'kw-compl)
+@@ -2515,7 +2514,6 @@
+   (if gnuplot-xemacs-p			; deal with font-lock
+       (if (fboundp 'turn-on-font-lock) (turn-on-font-lock))
+     (progn
+-      (make-variable-buffer-local 'font-lock-defaults)
+       (setq font-lock-defaults '(gnuplot-font-lock-keywords t t))))
+ ;;   (if (and gnuplot-xemacs-p gnuplot-toolbar-display-flag)
+ ;;       (condition-case ()		; deal with the toolbar
--- gnuplot-mode-0.6.0.orig/debian/patches/900_gnuplot.el_fix_indentation.dpatch
+++ gnuplot-mode-0.6.0/debian/patches/900_gnuplot.el_fix_indentation.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 900_gnuplot.el_fix_indentation.dpatch by Vincent Fourmond <fourmond@debian.org>
+##
+## DP: Fix the indentation of gnuplot-mode
+
+@DPATCH@
+diff -urNad gnuplot-mode~/gnuplot.el gnuplot-mode/gnuplot.el
+--- gnuplot-mode~/gnuplot.el	2010-02-01 22:31:00.096603264 +0100
++++ gnuplot-mode/gnuplot.el	2010-02-01 22:31:41.928609093 +0100
+@@ -2051,23 +2051,21 @@
+     (save-excursion
+       (save-excursion
+ 	(end-of-line 0)
+-	(if (bobp) ()
+-	  (re-search-backward "^[ \t]*." (point-min) "to_limit")
+-	  (back-to-indentation)
+-	  (setq indent (current-column))
+-	  (if (looking-at "s?pl\\(o?\\|\\(ot\\)?\\)[ \t]+.?")
+-	      (let ((plus (1- (length (match-string 0)))))
+-		(end-of-line)
+-		(backward-char 1)
+-		(if (looking-at (regexp-quote "\\"))
+-		    (setq indent  (+ plus indent)))))))
++	(if (bobp) 
++	    (set indent 0)
++	  (beginning-of-line)
++	  (if (looking-at "\\([^ \t\n]*[ \t]+\\).*\\\\$")
++	      (setq indent (length (match-string 1)))
++	    (setq indent 0))
++	  )
++	)
++      (beginning-of-line)
+       (if (= (current-indentation) indent)
+ 	  ()
+-	(beginning-of-line)
+ 	(delete-horizontal-space)
+-	(insert (make-string indent ? ))))
+-    (if (looking-at "[ \t]+$")
+-	(end-of-line))))
++	(insert (make-string indent ? )))
++      )
++    ))
+ 
+ ;; FWIW, here are all the options which can be negated:
+ ;; (insert (format "%s"
--- gnuplot-mode-0.6.0.orig/debian/patches/00list
+++ gnuplot-mode-0.6.0/debian/patches/00list
@@ -0,0 +1,3 @@
+500_gnuplot.el_make-variable-buffer-local
+850_gnuplot.el_fix-obsolete-backquotes
+900_gnuplot.el_fix_indentation
\ No newline at end of file
--- gnuplot-mode-0.6.0.orig/debian/patches/850_gnuplot.el_fix-obsolete-backquotes.dpatch
+++ gnuplot-mode-0.6.0/debian/patches/850_gnuplot.el_fix-obsolete-backquotes.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 850_gnuplot.el_fix-obsolete-backquotes.dpatch by Agustin Martin Domingo <agmartin@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No longer use obsolete old-style backquotes
+
+Fixes this warning:
+
+In toplevel form:
+gnuplot.el:331:1:Warning: !! The file uses old-style backquotes !!
+This functionality has been obsolete for more than 10 years already
+and will be removed soon.  See (elisp)Backquote in the manual.
+
+From the emacs-lisp manual:
+
+In old Emacs versions, before version 19.29, ``' used a different
+syntax which required an extra level of parentheses around the entire
+backquote construct.  Likewise, each `,' or `,@' substitution required
+an extra level of parentheses surrounding both the `,' or `,@' and the
+following expression.  The old syntax required whitespace between the
+``', `,' or `,@' and the following expression.
+
+@DPATCH@
+diff -urNad gnuplot-mode-0.6.0~/gnuplot.el gnuplot-mode-0.6.0/gnuplot.el
+--- gnuplot-mode-0.6.0~/gnuplot.el	2007-11-19 14:18:21.000000000 +0100
++++ gnuplot-mode-0.6.0/gnuplot.el	2007-11-19 14:19:42.000000000 +0100
+@@ -342,16 +342,16 @@
+     (if (fboundp 'defface)
+         nil
+       (defmacro defface (var values doc &rest args)
+-        (` (progn
+-             (defvar (, var) (quote (, var)))
+-             ;; To make colors for your faces you need to set your .Xdefaults
+-             ;; or set them up ahead of time in your .emacs file.
+-             (make-face (, var))
+-             ))))
++        `(progn
++	   (defvar ,var (quote ,var))
++	   ;; To make colors for your faces you need to set your .Xdefaults
++	   ;; or set them up ahead of time in your .emacs file.
++	   (make-face , var)
++	   )))
+     (if (fboundp 'defcustom)
+         nil
+       (defmacro defcustom (var value doc &rest args)
+-        (` (defvar (, var) (, value) (, doc)))))))
++        `(defvar ,var ,value ,doc)))))
+ 
+ ;; (eval-and-compile
+ ;;   (condition-case ()