diff options
| author | Juri Linkov <juri@jurta.org> | 2013-06-16 01:44:38 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2013-06-16 01:44:38 +0300 |
| commit | 31489a32f575cb5cfcd8748355f46ae2afcc4436 (patch) | |
| tree | aaeeaaaef9d43dcc3f89a8cbd81fb876a4554ef1 /lisp/files-x.el | |
| parent | 2809512e049af026719414c93998d3098a8735c5 (diff) | |
| download | emacs-31489a32f575cb5cfcd8748355f46ae2afcc4436.tar.gz emacs-31489a32f575cb5cfcd8748355f46ae2afcc4436.tar.bz2 emacs-31489a32f575cb5cfcd8748355f46ae2afcc4436.zip | |
* lisp/files-x.el (modify-file-local-variable-prop-line): Add local
variables to the end of the existing comment on the first line.
Use `file-auto-mode-skip' to skip interpreter magic line,
and also skip XML declaration.
Diffstat (limited to 'lisp/files-x.el')
| -rw-r--r-- | lisp/files-x.el | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/lisp/files-x.el b/lisp/files-x.el index 0ba245d423a..2ae1a0e4045 100644 --- a/lisp/files-x.el +++ b/lisp/files-x.el @@ -256,19 +256,40 @@ from the -*- line ignoring the input argument VALUE." (goto-char (point-min)) - ;; Skip interpreter magic line "#!" - (when (looking-at "^\\(#!\\|'\\\\\"\\)") + ;; Skip interpreter magic line "#!" or XML declaration. + (when (or (looking-at file-auto-mode-skip) + (looking-at "<\\?xml[^>\n]*>$")) (forward-line 1)) + (comment-normalize-vars) (let ((comment-style 'plain) - (comment-start (or comment-start ";;; "))) - (comment-region - (prog1 (point) - (insert "-*-") - (setq beg (point-marker)) - (setq end (point-marker)) - (insert "-*-\n")) - (point)))) + (comment-start (or comment-start ";;; ")) + (line-beg (line-beginning-position)) + (ce nil)) + ;; If the first line contains a comment. + (if (save-excursion + (and (looking-at comment-start-skip) + (goto-char (match-end 0)) + (re-search-forward comment-end-skip) + (goto-char (match-beginning 0)) + ;; Still on the same line? + (equal line-beg (line-beginning-position)) + (setq ce (point)))) + ;; Add local variables to the end of the existing comment. + (progn + (goto-char ce) + (insert " -*-") + (setq beg (point-marker)) + (setq end (point-marker)) + (insert "-*-")) + ;; Otherwise, add a new comment before the first line. + (comment-region + (prog1 (point) + (insert "-*-") + (setq beg (point-marker)) + (setq end (point-marker)) + (insert "-*-\n")) + (point))))) (cond ((looking-at "[ \t]*\\([^ \t\n\r:;]+\\)\\([ \t]*-\\*-\\)") |