[Emacs-diffs] trunk r113111: * progmodes/octave.el (octave-mode): Backward compatibility fix.

[Leo Liu]

------------------------------------------------------------
revno: 113111
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-21 14:45:37 +0800
message:
  * progmodes/octave.el (octave-mode): Backward compatibility fix.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-21 06:37:44 +0000
+++ b/lisp/ChangeLog    2013-06-21 06:45:37 +0000
@@ -1,3 +1,7 @@
+2013-06-21  Leo Liu  <address@hidden>
+
+       * progmodes/octave.el (octave-mode): Backward compatibility fix.
+
 2013-06-21  Glenn Morris  <address@hidden>
 
        * font-lock.el (lisp-font-lock-keywords-2): Add with-eval-after-load.

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-06-19 02:02:30 +0000
+++ b/lisp/progmodes/octave.el  2013-06-21 06:45:37 +0000
@@ -554,8 +554,13 @@
 
   (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 @@
 ;;; 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