Merge from emacs-23

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

diff --git a/lisp/forms-pass.el b/lisp/forms-pass.el
index d9628a3..431dca5 100644 (file)
--- a/lisp/forms-pass.el
+++ b/lisp/forms-pass.el
@@ -1,13 +1,24 @@
-;; demo for forms-mode
-;;
-;; This demo visits /etc/passwd.
+;;; forms-pass.el --- passwd file demo for forms-mode -*- no-byte-compile: t -*-
+
+;; This file is part of GNU Emacs.
+
+;;; Commentary:
+
+;; This demo visits your passwd file.
+
+;;; Code:
+
+;; use yp if present
+(or (file-exists-p (setq forms-file "/var/yp/src/passwd"))
+    (setq forms-file "/etc/passwd"))
 
-(setq forms-file "/etc/passwd")
 (setq forms-read-only t)               ; to make sure
 (setq forms-field-sep ":")
 (setq forms-number-of-fields 7)
+
 (setq forms-format-list
-     '("====== Visiting /etc/passwd ======\n\n"
+      (list
+       "====== Visiting " forms-file " ======\n\n"
        "User : "       1
        "   Uid: "      3
        "   Gid: "      4
@@ -18,3 +29,6 @@
        "\n\n"
        "Shell: "       7
        "\n"))
+
+;; arch-tag: 74801012-1a2d-4173-b9e4-fcfa241e2305
+;;; forms-pass.el ends here