octave: emacs/octave.el comparison

comparison emacs/octave.el @ 1628:40fe8e7c4ee9

[project @ 1995-11-14 15:22:47 by jwe]

author	jwe
date	Tue, 14 Nov 1995 15:22:47 +0000
parents	3b94ebd59353
children	d01f27049f54

comparison

equal deleted inserted replaced

-:8f798f963805
+:40fe8e7c4ee9
 (interactive)
 (octave-end-of-subprogram)
 (push-mark (point))
 (octave-beginning-of-subprogram))
+(defun octave-is-continuation-line ()
+"Returns t if the current line is a continuation line, nil otherwise."
+(save-excursion
+(beginning-of-line)
+(looking-at "^\\S<*\\(\\\\\\|\\.\\.\\.\\)[ \t]*\\(\\s<.*\\)?$")))
+(defun octave-point (position)
+"Returns the value of point at certain positions."
+(save-excursion
+(cond
+((eq position 'bol)  (beginning-of-line))
+((eq position 'eol)  (end-of-line))
+((eq position 'boi)  (back-to-indentation))
+((eq position 'bonl) (forward-line 1))
+((eq position 'bopl) (forward-line -1))
+(t (error "unknown buffer position requested: %s" position)))
+(point)))
+(defun octave-previous-line ()
+"Moves point to beginning of the previous Octave code line (i.e.,
+skips past all empty and comment lines."
+(interactive)
+(beginning-of-line)
+(while (progn
+	   (forward-line -1)
+	   (or (looking-at octave-comment-line-start-skip)
+	       (looking-at "[ \t]*$")))))
 (defun octave-previous-statement ()
 "Moves point to beginning of the previous Octave statement.
 Returns `first-statement' if that statement is the first
 non-comment Octave statement in the file, and nil otherwise."
 (interactive)
-(let (not-first-statement)
+(let ((eol (octave-point 'eol))
+	not-first-statement)
 (beginning-of-line)
 (while (and (setq not-first-statement (= (forward-line -1) 0))
-		(or (looking-at octave-comment-line-start-skip)
+(or (looking-at octave-comment-line-start-skip)
-		    (looking-at "[ \t]*$")
+(looking-at "[ \t]*$")
-		    (save-excursion
+		    (< (car (save-excursion
-		      (forward-line -1)
+			      (parse-partial-sexp (octave-point 'bol)
-		      (looking-at octave-continuation-regexp))
+						  eol)))
-		    (looking-at
+		       0)
-		     (concat "[ \t]*"  octave-comment-start-skip)))))
+(save-excursion
+(forward-line -1)
+(looking-at octave-continuation-regexp))
+(looking-at
+(concat "[ \t]*"  octave-comment-start-skip)))))
 (if (not not-first-statement)
 'first-statement)))
 (defun octave-next-statement ()
 "Moves point to beginning of the next Octave statement.
 	(and (= count 0)
 	     ;; All pairs accounted for.
 	     (point))))))
 (defun octave-indent-line ()
-"Indents current Octave line based on its contents and on previous lines."
+"Indents current Octave line based on its contents and on previous
+lines."
 (interactive)
 (let ((cfi (octave-calculate-indent))
 	(prev-indent (current-indentation))
-	(prev-point (point))
+	(prev-column (current-column)))
-	new-indent new-point new-eol new-bol new-indent-point)
 (if (save-excursion
 	  (beginning-of-line)
 	  (and (not (looking-at octave-comment-line-start-skip))
 	       (not (octave-find-comment-start-skip))))
 	(progn
 	  (beginning-of-line)
 	  (delete-horizontal-space)
-;;
+	  (indent-to cfi)
-;; There must be a better way!
+	  (if (> prev-column prev-indent)
-;;
+	      (goto-char (+ (point) (- prev-column prev-indent)))))
-	  (setq new-indent (indent-to cfi))
-	  (setq new-point (+ prev-point (- new-indent prev-indent)))
-	  (setq new-eol (save-excursion (end-of-line) (point)))
-	  (setq new-bol (save-excursion (beginning-of-line) (point)))
-	  (setq new-indent-point (+ new-bol new-indent))
-	  (cond
-	   ((> prev-point new-eol)
-	    (goto-char new-eol))
-	   ((< new-point new-indent-point)
-	    (goto-char new-indent-point))
-	   (t
-	    (goto-char new-point))))
 (octave-indent-comment))
 (if (and auto-fill-function
-	     (> (save-excursion (end-of-line) (current-column)) fill-column))
+	     (> (save-excursion (end-of-line) (current-column))
+		fill-column))
 	(save-excursion
 	  (end-of-line)
 	  (octave-do-auto-fill)))
 (if octave-blink-matching-blocks
 	(progn
 	(forward-char)))
 icol))
 (defun octave-calculate-indent ()
 "Calculates the Octave indent column based on previous lines."
-(let ((indent-col 0)
+(interactive)
-	first-statement)
+(let* ((prev-line-is-continuation-line
+	  (save-excursion
+	    (octave-previous-line)
+	    (octave-is-continuation-line)))
+	 (indent-col 0)
+	 first-statement)
 (save-excursion
-(setq first-statement (octave-previous-statement))
+(beginning-of-line)
-(if (not first-statement)
+(if (condition-case nil
-	  (progn
+	      (progn
-	    (skip-chars-forward " \t")
+		(up-list -1)
-	    (setq indent-col (+ (octave-current-line-indentation)
+		t)
-				(octave-calc-indent-this-line 1 0))))))
+	    (error nil))
+	  (setq indent-col (+ 1 (current-column)))
+	(setq first-statement (octave-previous-statement))
+	(if (not first-statement)
+	    (progn
+	      (skip-chars-forward " \t")
+	      (setq indent-col (+ (octave-current-line-indentation)
+				  (octave-calc-indent-this-line 1 0)))
+	      (if (and prev-line-is-continuation-line
+		       (octave-is-continuation-line))
+		  (setq indent-col (+ indent-col
+				      octave-continuation-indent)))))))
 ;; This fixes things if the line we are on is and else- or
 ;; end-type statement.
 (if (save-excursion
-	  (beginning-of-line)
+(beginning-of-line)
-	  (skip-chars-forward " \t")
+(skip-chars-forward " \t")
-	  (looking-at "\\(end\\|else\\|catch\\|unwind_protect_cleanup\\)"))
+(looking-at "\\(end\\|else\\|catch\\|unwind_protect_cleanup\\)"))
-	(setq indent-col (+ indent-col
+(setq indent-col (+ indent-col
-			    (octave-calc-indent-this-line -1 1))))
+(octave-calc-indent-this-line -1 1))))
 indent-col))
 (defun octave-electric-semi ()
 (interactive)
 (if (and (not (octave-is-in-string-p (point))) octave-auto-newline)

Mercurial > octave

comparison emacs/octave.el @ 1628:40fe8e7c4ee9