aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2005-05-27 11:51:14 +0000
committerLute Kamstra2005-05-27 11:51:14 +0000
commit1f2503a581d35bcb2669254b5a2b58acf3a85e76 (patch)
tree42664dc1d24b6a4feac8ab293dd36c806c0efbf9
parent6c5a38fa3fb7c995768c6dd44274f1f8c6188396 (diff)
downloademacs-1f2503a581d35bcb2669254b5a2b58acf3a85e76.tar.gz
emacs-1f2503a581d35bcb2669254b5a2b58acf3a85e76.zip
(outline-1, outline-2, outline-3, outline-4)
(outline-5, outline-6, outline-7, outline-8): Specify customization group.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/outline.el49
2 files changed, 45 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76c39d30a97..d803aebf37c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12005-05-27 Lute Kamstra <lute@gnu.org> 12005-05-27 Lute Kamstra <lute@gnu.org>
2 2
3 * outline.el (outline-1, outline-2, outline-3, outline-4)
4 (outline-5, outline-6, outline-7, outline-8): Specify
5 customization group.
6
3 * longlines.el: Don't require easy-mmode. 7 * longlines.el: Don't require easy-mmode.
4 (longlines-visible-face): Specify customization group. 8 (longlines-visible-face): Specify customization group.
5 9
@@ -15,7 +19,7 @@
15 * international/code-pages.el: Don't register a coding system into 19 * international/code-pages.el: Don't register a coding system into
16 non-iso-charset-alist more than once. 20 non-iso-charset-alist more than once.
17 (cp-make-coding-system): Likewise. 21 (cp-make-coding-system): Likewise.
18 22
192005-05-26 John Wiegley <johnw@newartisans.com> 232005-05-26 John Wiegley <johnw@newartisans.com>
20 24
21 * eshell/esh-cmd.el (eshell-eval-command): If the return value of 25 * eshell/esh-cmd.el (eshell-eval-command): If the return value of
diff --git a/lisp/outline.el b/lisp/outline.el
index 89e9e193e9c..b807365f733 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1,6 +1,6 @@
1;;; outline.el --- outline mode commands for Emacs 1;;; outline.el --- outline mode commands for Emacs
2 2
3;; Copyright (C) 1986, 93, 94, 95, 97, 2000, 01, 2004 3;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2004
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Maintainer: FSF 6;; Maintainer: FSF
@@ -167,14 +167,45 @@ in the file it applies to."
167 0 '(outline-font-lock-face) nil t))) 167 0 '(outline-font-lock-face) nil t)))
168 "Additional expressions to highlight in Outline mode.") 168 "Additional expressions to highlight in Outline mode.")
169 169
170(defface outline-1 '((t :inherit font-lock-function-name-face)) "Level 1.") 170(defface outline-1
171(defface outline-2 '((t :inherit font-lock-variable-name-face)) "Level 2.") 171 '((t :inherit font-lock-function-name-face))
172(defface outline-3 '((t :inherit font-lock-keyword-face)) "Level 3.") 172 "Level 1."
173(defface outline-4 '((t :inherit font-lock-builtin-face)) "Level 4.") 173 :group 'outlines)
174(defface outline-5 '((t :inherit font-lock-comment-face)) "Level 5.") 174
175(defface outline-6 '((t :inherit font-lock-constant-face)) "Level 6.") 175(defface outline-2
176(defface outline-7 '((t :inherit font-lock-type-face)) "Level 7.") 176 '((t :inherit font-lock-variable-name-face))
177(defface outline-8 '((t :inherit font-lock-string-face)) "Level 8.") 177 "Level 2."
178 :group 'outlines)
179
180(defface outline-3
181 '((t :inherit font-lock-keyword-face))
182 "Level 3."
183 :group 'outlines)
184
185(defface outline-4
186 '((t :inherit font-lock-builtin-face))
187 "Level 4."
188 :group 'outlines)
189
190(defface outline-5
191 '((t :inherit font-lock-comment-face))
192 "Level 5."
193 :group 'outlines)
194
195(defface outline-6
196 '((t :inherit font-lock-constant-face))
197 "Level 6."
198 :group 'outlines)
199
200(defface outline-7
201 '((t :inherit font-lock-type-face))
202 "Level 7."
203 :group 'outlines)
204
205(defface outline-8
206 '((t :inherit font-lock-string-face))
207 "Level 8."
208 :group 'outlines)
178 209
179(defvar outline-font-lock-faces 210(defvar outline-font-lock-faces
180 [outline-1 outline-2 outline-3 outline-4 211 [outline-1 outline-2 outline-3 outline-4