aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2011-06-15 07:07:48 -0700
committerDan Nicolaescu2011-06-15 07:07:48 -0700
commitc5cde04220c3961df41d290dfe3ddbcba821fa26 (patch)
tree7b2e5e0373b3c374e9744c5ce1d51b4b1ba3b1d5
parent571e1872c0d5ebfb90ed6dd752134009e38e3712 (diff)
downloademacs-c5cde04220c3961df41d290dfe3ddbcba821fa26.tar.gz
emacs-c5cde04220c3961df41d290dfe3ddbcba821fa26.zip
Derive some programming modes from prog-mode.
* lisp/progmodes/python.el (python-mode): Derive from prog-mode. * lisp/progmodes/ps-mode.el (ps-mode): * lisp/progmodes/mixal-mode.el (mixal-mode): * lisp/progmodes/ld-script.el (ld-script-mode): Likewise.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/ld-script.el2
-rw-r--r--lisp/progmodes/mixal-mode.el2
-rw-r--r--lisp/progmodes/ps-mode.el2
-rw-r--r--lisp/progmodes/python.el2
5 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4b554464a7..b868daaf907 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12011-06-15 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * progmodes/python.el (python-mode): Derive from prog-mode.
4 * progmodes/ps-mode.el (ps-mode):
5 * progmodes/mixal-mode.el (mixal-mode):
6 * progmodes/ld-script.el (ld-script-mode): Likewise.
7
12011-06-15 Martin Rudalics <rudalics@gmx.at> 82011-06-15 Martin Rudalics <rudalics@gmx.at>
2 9
3 * window.el (display-buffer-alist): Trim default value to avoid 10 * window.el (display-buffer-alist): Trim default value to avoid
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 8bdac61d4ab..c682bfa0280 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -168,7 +168,7 @@
168 "Default font-lock-keywords for `ld-script-mode'.") 168 "Default font-lock-keywords for `ld-script-mode'.")
169 169
170;;;###autoload 170;;;###autoload
171(define-derived-mode ld-script-mode nil "LD-Script" 171(define-derived-mode ld-script-mode prog-mode "LD-Script"
172 "A major mode to edit GNU ld script files" 172 "A major mode to edit GNU ld script files"
173 (set (make-local-variable 'comment-start) "/* ") 173 (set (make-local-variable 'comment-start) "/* ")
174 (set (make-local-variable 'comment-end) " */") 174 (set (make-local-variable 'comment-end) " */")
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 0d8cdd9f9b1..103c7be7d3c 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1103,7 +1103,7 @@ Assumes that file has been compiled with debugging support."
1103 (error "mixvm.el needs to be loaded to run `mixvm'"))) 1103 (error "mixvm.el needs to be loaded to run `mixvm'")))
1104 1104
1105;;;###autoload 1105;;;###autoload
1106(define-derived-mode mixal-mode fundamental-mode "mixal" 1106(define-derived-mode mixal-mode prog-mode "mixal"
1107 "Major mode for the mixal asm language." 1107 "Major mode for the mixal asm language."
1108 (set (make-local-variable 'comment-start) "*") 1108 (set (make-local-variable 'comment-start) "*")
1109 (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*") 1109 (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*")
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index cade56a194c..d60e7513651 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -485,7 +485,7 @@ If nil, use `temporary-file-directory'."
485;; PostScript mode. 485;; PostScript mode.
486 486
487;;;###autoload 487;;;###autoload
488(define-derived-mode ps-mode fundamental-mode "PostScript" 488(define-derived-mode ps-mode prog-mode "PostScript"
489 "Major mode for editing PostScript with GNU Emacs. 489 "Major mode for editing PostScript with GNU Emacs.
490 490
491Entry to this mode calls `ps-mode-hook'. 491Entry to this mode calls `ps-mode-hook'.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b99cad1d081..3d243f14f07 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2420,7 +2420,7 @@ without confirmation."
2420(defvar python-mode-running) ;Dynamically scoped var. 2420(defvar python-mode-running) ;Dynamically scoped var.
2421 2421
2422;;;###autoload 2422;;;###autoload
2423(define-derived-mode python-mode fundamental-mode "Python" 2423(define-derived-mode python-mode prog-mode "Python"
2424 "Major mode for editing Python files. 2424 "Major mode for editing Python files.
2425Turns on Font Lock mode unconditionally since it is currently required 2425Turns on Font Lock mode unconditionally since it is currently required
2426for correct parsing of the source. 2426for correct parsing of the source.