procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

* progmodes/octave.el (octave-mode): Backward compatibility fix.

Browse source
This commit is contained in:
Leo Liu 2013-06-21 14:45:37 +08:00
parent 21e3f963e7
commit 62efb35e42
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2013-06-21 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (octave-mode): Backward compatibility fix.
2013-06-21 Glenn Morris <rgm@gnu.org>
* font-lock.el (lisp-font-lock-keywords-2): Add with-eval-after-load.

11
lisp/progmodes/octave.el
View file

@ -554,8 +554,13 @@ definitions can also be stored in files and used in batch mode."
(setq-local fill-nobreak-predicate
(lambda () (eq (octave-in-string-p) ?')))
(add-function :around (local 'comment-line-break-function)
#'octave--indent-new-comment-line)
(with-no-warnings
(if (fboundp 'add-function) ; new in 24.4
(add-function :around (local 'comment-line-break-function)
#'octave--indent-new-comment-line)
(setq-local comment-line-break-function
(apply-partially #'octave--indent-new-comment-line
#'comment-indent-new-line))))
(setq font-lock-defaults '(octave-font-lock-keywords))
@ -1151,8 +1156,6 @@ q: Don't fix\n" func file))
;;; Indentation
(defun octave-indent-new-comment-line (&optional soft)
;; FIXME: C-M-j should probably be bound globally to a function like
;; this one.
"Break Octave line at point, continuing comment if within one.
Insert `octave-continuation-string' before breaking the line
unless inside a list. Signal an error if within a single-quoted