aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/sgml-mode.el5
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 241d69ec1c3..23b7efc606d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-09-27 Glenn Morris <rgm@gnu.org> 12012-09-27 Glenn Morris <rgm@gnu.org>
2 2
3 * textmodes/sgml-mode.el: Don't require outline when compiling.
4 (outline-regexp, outline-heading-end-regexp, outline-level): Declare.
5
3 * term.el (term-ansi-reset): 6 * term.el (term-ansi-reset):
4 Try setting term-ansi-face-already-done to nil. (Bug#11785) 7 Try setting term-ansi-face-already-done to nil. (Bug#11785)
5 8
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 67d7f8c01f9..46c65b25b37 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -34,7 +34,6 @@
34 34
35(eval-when-compile 35(eval-when-compile
36 (require 'skeleton) 36 (require 'skeleton)
37 (require 'outline)
38 (require 'cl-lib)) 37 (require 'cl-lib))
39 38
40(defgroup sgml nil 39(defgroup sgml nil
@@ -1938,6 +1937,10 @@ This takes effect when first loading the library.")
1938 ("wbr" . "Enable <br> within <nobr>")) 1937 ("wbr" . "Enable <br> within <nobr>"))
1939 "Value of `sgml-tag-help' for HTML mode.") 1938 "Value of `sgml-tag-help' for HTML mode.")
1940 1939
1940(defvar outline-regexp)
1941(defvar outline-heading-end-regexp)
1942(defvar outline-level)
1943
1941 1944
1942;;;###autoload 1945;;;###autoload
1943(define-derived-mode html-mode sgml-mode '(sgml-xml-mode "XHTML" "HTML") 1946(define-derived-mode html-mode sgml-mode '(sgml-xml-mode "XHTML" "HTML")