=== modified file 'lisp/files.el' --- lisp/files.el 2013-03-24 06:42:25 +0000 +++ lisp/files.el 2013-04-03 12:07:47 +0000 @@ -3046,7 +3046,7 @@ result) (cond ((not end) nil) - ((looking-at "[ \t]*\\([^ \t\n\r:;]+\\)\\([ \t]*-\\*-\\)") + ((looking-at "[ \t]*\\([^ \t\n\r;]+\\)\\([ \t]*-\\*-\\)") ;; Simple form: "-*- MODENAME -*-". (if mode-only (intern (concat (match-string 1) "-mode")))) @@ -3058,7 +3058,7 @@ (while (and (or (not mode-only) (not result)) (< (point) end)) - (unless (looking-at "[ \t]*\\([^ \t\n:]+\\)[ \t]*:[ \t]*") + (unless (looking-at "[ \t]*\\([^ \t\n]+\\)[ \t]*:[ \t]*") (message "Malformed mode-line") (throw 'malformed-line nil)) (goto-char (match-end 0))