Move some forms.el example files to etc/forms directory

* etc/forms/README: New.

* etc/forms/forms-d2.dat: Move to etc/forms/ subdirectory.

* etc/forms/forms-d2.el, etc/forms/forms-pass.el: Move here from ../lisp.

* lisp/forms.el: Related comment change.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2a6cd7192204ef7d6f80851f3cfa614791c01365..ffd9f7d31f6b14dc72b7c1efa9da97964c41723a 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-07  Glenn Morris  <rgm@gnu.org>
+
+       * forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.
+       * forms/forms-d2.dat: Move to forms/ subdirectory.
+       * forms/README: New.
+
 2012-05-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Do not limit current-time-string to years 1000..9999.

diff --git a/etc/forms/README b/etc/forms/README
new file mode 100644 (file)
index 0000000..4d72845
--- /dev/null
+++ b/etc/forms/README
@@ -0,0 +1 @@
+This directory contains some example files for the forms.el library.

diff --git a/etc/forms-d2.dat b/etc/forms/forms-d2.dat
similarity index 100%
rename from etc/forms-d2.dat
rename to etc/forms/forms-d2.dat

diff --git a/lisp/forms-d2.el b/etc/forms/forms-d2.el
similarity index 95%
rename from lisp/forms-d2.el
rename to etc/forms/forms-d2.el
index 7d7336030dbac762b293f840c36ba02130911b2b..9fa2145e4d0abd2b09bad0ca8d8fd9f6cdf8701e 100644 (file)
--- a/lisp/forms-d2.el
+++ b/etc/forms/forms-d2.el
@@ -1,4 +1,4 @@
-;;; forms-d2.el --- demo forms-mode -*- no-byte-compile: t -*-
+;;; forms-d2.el --- demo forms-mode
 
 ;; Copyright (C) 1991, 1994-1997, 2001-2012 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@
 ;;; Code:
 
 ;; Set the name of the data file.
-(setq forms-file (expand-file-name "forms-d2.dat" data-directory))
+(setq forms-file (expand-file-name "forms/forms-d2.dat" data-directory))
 
 ;; Use 'forms-enumerate' to set field names and number thereof.
 (setq forms-number-of-fields

diff --git a/lisp/forms-pass.el b/etc/forms/forms-pass.el
similarity index 88%
rename from lisp/forms-pass.el
rename to etc/forms/forms-pass.el
index b635c965cf073d16f8bcf34755e5e3755e6c1c33..34d4548434b8d83307b2184dd40be79578ae16be 100644 (file)
--- a/lisp/forms-pass.el
+++ b/etc/forms/forms-pass.el
@@ -1,4 +1,4 @@
-;;; forms-pass.el --- passwd file demo for forms-mode -*- no-byte-compile: t -*-
+;;; forms-pass.el --- passwd file demo for forms-mode
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db27b30a0346ec56fae834e00009fec795f72025..fe31437f9aae8e2509ea9f2f89a504f35db4f838 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-07  Glenn Morris  <rgm@gnu.org>
 
+       * forms-d2.el, forms-pass.el: Move to ../etc/forms directory.
+
        * international/mule.el (find-auto-coding): Make "unibyte: t" obsolete.
 
 2012-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/forms.el b/lisp/forms.el
index 69433de0e14f9c24c5525a36a03941edff844ffa..3175ef9dfa99f75c4e0e373f896901134b088496 100644 (file)
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -21,7 +21,7 @@
 
 ;;; Commentary:
 
-;; Visit a file using a form.  See forms-d2.el for examples.
+;; Visit a file using a form.  See etc/forms for examples.
 ;;
 ;; === Naming conventions
 ;;