diff options
| author | Leo Liu <sdl.web@gmail.com> | 2013-05-13 15:24:22 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2013-05-13 15:24:22 +0800 |
| commit | b0e069c2ac35e6daba0470d61289dfc4f07e7246 (patch) | |
| tree | b5321206ebcd48efe2d703509d989b9c3f188237 | |
| parent | bb8eb35723ef08983b45382a442df90a4e48b3d3 (diff) | |
| download | emacs-b0e069c2ac35e6daba0470d61289dfc4f07e7246.tar.gz | |
* progmodes/octave.el (octave-indent-comment): Fix indentation for %!.
(octave-comment-start-skip): Include %!.
(octave-mode): Set comment-start-skip to octave-comment-start-skip.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/octave.el | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9fdb5fdc6f8..ac5a5c34e44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,11 @@ 2013-05-13 Leo Liu <sdl.web@gmail.com> - * progmodes/octave.el (octave-indent-comment): Fix the indentation - of ### or %%%. + * progmodes/octave.el (octave-indent-comment): Fix indentation for + ###, and %!. (octave-mode-map): Bind octave-indent-defun to C-c C-q instead of C-M-q. + (octave-comment-start-skip): Include %!. + (octave-mode): Set comment-start-skip to octave-comment-start-skip. 2013-05-12 Leo Liu <sdl.web@gmail.com> diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index fc1e7bb757e..7189b606a0c 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -64,7 +64,7 @@ Used in `octave-mode' and `inferior-octave-mode' buffers.") (string octave-comment-char ?\s) "String to insert to start a new Octave in-line comment.") -(defvar octave-comment-start-skip "\\s<+\\s-*" +(defvar octave-comment-start-skip "\\(?:%!\\|\\s<+\\)\\s-*" "Regexp to match the start of an Octave comment up to its body.") (defvar octave-begin-keywords @@ -439,7 +439,8 @@ Non-nil means always go to the next Octave code line after sending." ((octave-in-string-or-comment-p) nil) ((looking-at-p "\\s<\\{3,\\}") 0) - ((and (looking-at-p "\\s<\\(?:[^{}]\\|$\\)") + ;; Exclude %{, %} and %!. + ((and (looking-at-p "\\s<\\(?:[^{}!]\\|$\\)") (not (looking-at-p "\\s<\\s<"))) (comment-choose-indent))))) @@ -532,10 +533,7 @@ definitions can also be stored in files and used in batch mode." (setq-local comment-start octave-comment-start) (setq-local comment-end "") - ;; Don't set it here: it's not really a property of the language, - ;; just a personal preference of the author. - ;; (setq-local comment-column 32) - (setq-local comment-start-skip "\\s<+\\s-*") + (setq-local comment-start-skip octave-comment-start-skip) (setq-local comment-add 1) (setq-local parse-sexp-ignore-comments t) |