* xdisp.c (SKIP_GLYPHS): Removed unused macro.

[bpt/emacs.git] / lisp / forms-d2.el

diff --git a/lisp/forms-d2.el b/lisp/forms-d2.el
index ae338ab..12cd5d7 100644 (file)
--- a/lisp/forms-d2.el
+++ b/lisp/forms-d2.el
@@ -1,10 +1,25 @@
 ;;; forms-d2.el --- demo forms-mode -*- no-byte-compile: t -*-
 
+;; Copyright (C) 1991, 1994-1997, 2001-2011 Free Software Foundation, Inc.
+
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
 ;; Created: 1989
 
 ;; This file is part of GNU Emacs.
 
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 ;;; Commentary:
 
 ;; This sample forms exploit most of the features of forms mode.
@@ -12,7 +27,7 @@
 ;;; Code:
 
 ;; Set the name of the data file.
-(setq forms-file "forms-d2.dat")
+(setq forms-file (expand-file-name "forms-d2.dat" data-directory))
 
 ;; Use 'forms-enumerate' to set field names and number thereof.
 (setq forms-number-of-fields
@@ -32,17 +47,17 @@
 ;; The following functions are used by this form for layout purposes.
 ;;
 (defun arch-tocol (target &optional fill)
-  "Produces a string to skip to column TARGET. Prepends newline if needed.
+  "Produces a string to skip to column TARGET.  Prepends newline if needed.
 The optional FILL should be a character, used to fill to the column."
   (if (null fill)
-      (setq fill ? ))
+      (setq fill ?\s))
   (if (< target (current-column))
       (concat "\n" (make-string target fill))
     (make-string (- target (current-column)) fill)))
 ;;
 (defun arch-rj (target field &optional fill)
   "Produces a string to skip to column TARGET minus the width of field FIELD.
-Prepends newline if needed. The optional FILL should be a character,
+Prepends newline if needed.  The optional FILL should be a character,
 used to fill to the column."
   (arch-tocol (- target (length (nth field forms-fields))) fill))