diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
| commit | fbf349734468d48b421c3d03074bb66dfcf3115b (patch) | |
| tree | 0a7d1ee844b6c591a5a499d23e35931945106e5a /lisp/textmodes/conf-mode.el | |
| parent | f0caabd962b662cccbea472995d86af718cc8d0b (diff) | |
| parent | 4b5fa40e1f1ba3cafde672863a0331311d1c2695 (diff) | |
| download | emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.gz emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.bz2 emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.zip | |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
Diffstat (limited to 'lisp/textmodes/conf-mode.el')
| -rw-r--r-- | lisp/textmodes/conf-mode.el | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 75249f7b547..8c009921d09 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -1,6 +1,8 @@ ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -;; Copyright (C) 2004 by Daniel Pfeiffer <occitan@esperanto.org> +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. + +;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Keywords: conf ini windows java ;; This file is part of GNU Emacs. @@ -31,6 +33,8 @@ (require 'newcomment) +(defvar outline-heading-end-regexp) + ;; Variables: (defgroup conf nil @@ -227,15 +231,15 @@ whitespace.") (if (>= arg 0) (progn (indent-to-column arg) - (or (not conf-assignment-space) (memq (char-before (point)) '(? ?\t)) (insert ? )) - (insert conf-assignment-sign (if (and conf-assignment-space (not (eolp))) ?\ ""))) - (insert (if conf-assignment-space ?\ "") conf-assignment-sign) + (or (not conf-assignment-space) (memq (char-before (point)) '(?\s ?\t)) (insert ?\s)) + (insert conf-assignment-sign (if (and conf-assignment-space (not (eolp))) ?\s ""))) + (insert (if conf-assignment-space ?\s "") conf-assignment-sign) (unless (eolp) (indent-to-column (- arg)) - (or (not conf-assignment-space) (memq (char-before (point)) '(? ?\t)) (insert ? )))) + (or (not conf-assignment-space) (memq (char-before (point)) '(?\s ?\t)) (insert ?\s)))) (unless (eolp) (if (>= (current-column) (abs arg)) - (insert ? ) + (insert ?\s) (indent-to-column (abs arg)))))) (forward-line)))) |