From 6a6bcdae6bb471f1674920b8552b28791d973cb1 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 30 Apr 2014 11:30:00 +0200 Subject: [PATCH] fix for cfe-config-adduser-ldap due to changes in cfengine. Signed-off-by: Andreas Gerler --- custom.el | 1 + init.el | 6 ++-- templates/INSTALL | 75 +++++++++++++++++++++++++++++++++++++++++++++++ templates/README | 42 ++++++++++++++++++++++++++ 4 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 templates/INSTALL create mode 100644 templates/README diff --git a/custom.el b/custom.el index 28fef31b..bc8a1ba9 100644 --- a/custom.el +++ b/custom.el @@ -13,6 +13,7 @@ '(package-user-dir "~/.xemacs/elpa") '(recentf-max-saved-items 42) '(savehist-mode t nil (savehist)) + '(template-default-directories (quote ("~/.xemacs/templates/"))) '(toolbar-visible-p nil) '(vc-handled-backends (quote (RCS CVS SVN SCCS Bzr Hg Mtn Arch)))) (custom-set-faces diff --git a/init.el b/init.el index 0d53eb1d..9c818d0a 100644 --- a/init.el +++ b/init.el @@ -35,8 +35,8 @@ load-path)) ;;; (package-initialize) (setq tex-dvi-view-command "(f=*; pdflatex \"${f%.dvi}.tex\" && open \"${f%.dvi}.pdf\")") -(require 'rainbow-delimiters) -(global-rainbow-delimiters-mode) +;;(require 'rainbow-delimiters) +;;(global-rainbow-delimiters-mode) (require 'centered-cursor-mode) @@ -418,7 +418,7 @@ directory to make multiple eshell windows easier." \"users[" user "][uid]\" string => \"" (substring ( shell-command-to-string (concat "ldapse " user " uidNumber")) 0 -1) "\"; \"users[" user "][gid]\" string => \"" (substring ( shell-command-to-string (concat "ldapse " user " uidNumber")) 0 -1)"\"; \"users[" user "][group]\" string => \"" user "\"; - \"users[" user "][groups]\" slist => { \"adm\",\"apache\",\"games\" }; + \"users[" user "][groups]\" string => \"adm,apache,games\"; \"users[" user "][home]\" string => \"/home/" user "\"; \"users[" user "][shell]\" string => \"/bin/bash\"; \"users[" user "][flags]\" string => \"-m\"; diff --git a/templates/INSTALL b/templates/INSTALL new file mode 100644 index 00000000..2587c1a7 --- /dev/null +++ b/templates/INSTALL @@ -0,0 +1,75 @@ +### INSTALL for template.el: Template Package for Emacs + +## Copyright 2002 Free Software Foundation, Inc. +## +## Author: Christoph Wedler +## Keywords: Emacs, template, comment decoration, auto-updating, data, tools +## X-URL: http://emacs-template.sourceforge.net/ + + +The installation process with explanations (all files mentioned here are +relative to top-level directory "template/" in the distribution): + + + 1. Copy file "lisp/template.el" to your load-path. That means: + + Use C-h v load-path RET to check the value and the documentation of + Emacs' load-path. + + You must copy "lisp/template.el" to one of the directories in the + value list. If no directory in the default value is appropriate, you + must add "your own" directory to that list. + + The cases: + + (a) You want to copy the file to DIR, i.e., one of the listed + directories: copy "lisp/template.el" to DIR. + + (b) You use Emacs and install Template in your home directory: + create directory "~/.emacs.d/lisp/" and copy "lisp/template.el" + to it. Add the following lines at the beginning of your Emacs + init file: + + (setq load-path (cons (expand-file-name "~/.emacs.d/lisp") + load-path)) + + (c) You use XEmacs-20.3 or higher and install Template in your + home directory: create directory + "~/.xemacs/xemacs-packages/lisp/". It will be automatically + added to `load-path' if you start XEmacs the next time. + + (d) You install Template system-wide: the target directory is + "EMACS/site-lisp/" or "XEMACS/site-packages/lisp/". But you + probably know that if you are responsible for Emacs or XEmacs + on your site. + + + 2. Byte-compile file "template.el": visit file "template.el" (that is, + the copy) and use menu entry + + "Emacs-Lisp"/"Lisp" >> "Byte-compile This File" + or + M-x byte-compile-file RET template.el RET. + + Note: during compilation, you get warnings about missing functions. + You can ignore them, since these functions will not be used in the + Emacs/XEmacs branch or version you are using. + + + 3. Visit your Emacs init file. + + - The Emacs init file is usuall file "~/.emacs". + - In XEmacs-21.4 or higher, it is usually "~/.xemacs/init.el". + - For a system-wide installation, the init file is "default.el". + + Add the following lines into your init file (it should be inserted + after the lines from case 1b): + + (require 'template) + (template-initialize) + + 4. You might want to copy the template files "templates/*.tpl" to + "~/.templates/" and change them according to your preferences. + + +### INSTALL ends here diff --git a/templates/README b/templates/README new file mode 100644 index 00000000..1c9d148d --- /dev/null +++ b/templates/README @@ -0,0 +1,42 @@ +### README for template.el: Template Package for Emacs + +## Copyright 2002 Free Software Foundation, Inc. +## +## Author: Christoph Wedler +## Keywords: Emacs, template, comment decoration, auto-updating, data, tools +## X-URL: http://emacs-template.sourceforge.net/ + + +When you create a new file with Emacs, package Template supplies an initial +buffer content via a template: a file with normal text and expansion +forms. There is a menu to easily create such templates. You can also use new +commands to decorate comments and update the buffer contents. + +The main difference between Template and other similar packages is that you +can define very flexible templates without having to learn Lisp or changing +your Emacs init file. This package does not help Lisp programmers to define +complex macros. + + +Files in the distribution (top level directory "template"): + + * README: this file + * INSTALL: how to install "lisp/template.el" + * lisp/template.el: main file + * lisp/ChangeLog: its detailed ChangeLog file + +Templates in the distribution (in "template/templates"): + + * DEFAULT.tpl: the last resort, you should always have this file + * Makefile.tpl + * README.tpl + * TEMPLATE.c.tpl + * TEMPLATE.cls.tpl + * TEMPLATE.el.tpl + * TEMPLATE.h.tpl + * TEMPLATE.html.tpl + * TEMPLATE.java.tpl + * TEMPLATE.sty.tpl + * TEMPLATE.tex.tpl + +## README ends here -- 2.47.3