Merge changes from emacs-23 branch

[gnu-emacs] / lisp / progmodes / mixal-mode.el

diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index bf5662cdfa3587fe7c6f491936995b1c857ff6f9..103c7be7d3c01a44070ef42ccb290cf04a413e41 100644 (file)
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1059,8 +1059,7 @@ EXECUTION-TIME holds info about the time it takes, number or string.")
     (let* ((completion-ignore-case t)
           ;; we already have a list, but it is not in the right format
           ;; transform it to a valid table so completition can use it
-          (table (mapcar '(lambda (elm)
-                            (cons (symbol-name (car elm)) nil))
+          (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil))
                          mixal-operation-codes-alist))
           ;; prompt is different depending on we are close to a valid op-code
           (have-default (assq (intern-soft (current-word))
@@ -1104,7 +1103,7 @@ Assumes that file has been compiled with debugging support."
     (error "mixvm.el needs to be loaded to run `mixvm'")))
 
 ;;;###autoload
-(define-derived-mode mixal-mode fundamental-mode "mixal"
+(define-derived-mode mixal-mode prog-mode "mixal"
   "Major mode for the mixal asm language."
   (set (make-local-variable 'comment-start) "*")
   (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*")