diff options
| -rw-r--r-- | etc/ChangeLog | 6 | ||||
| -rw-r--r-- | etc/forms/README | 1 | ||||
| -rw-r--r-- | etc/forms/forms-d2.dat (renamed from etc/forms-d2.dat) | 0 | ||||
| -rw-r--r-- | etc/forms/forms-d2.el (renamed from lisp/forms-d2.el) | 4 | ||||
| -rw-r--r-- | etc/forms/forms-pass.el (renamed from lisp/forms-pass.el) | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/forms.el | 2 |
7 files changed, 13 insertions, 4 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 2a6cd719220..ffd9f7d31f6 100644 --- 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 index 00000000000..4d728450ac4 --- /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 index f6c599c9aa8..f6c599c9aa8 100644 --- a/etc/forms-d2.dat +++ b/etc/forms/forms-d2.dat diff --git a/lisp/forms-d2.el b/etc/forms/forms-d2.el index 7d7336030db..9fa2145e4d0 100644 --- 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 index b635c965cf0..34d4548434b 100644 --- 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 db27b30a034..fe31437f9aa 100644 --- 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 69433de0e14..3175ef9dfa9 100644 --- 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 ;; |