comparison lisp/progmodes/sh-script.el @ 64266:a634aa374675

(sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \. (sh-get-indent-info): Simplify. (sh-mark-init, sh-learn-buffer-indent, sh-add-completer): with-current-buffer.

64265:dde987aec664

      (unless have-result
	;; Continuation lines are handled specially
	(if (sh-this-is-a-continuation)
	    (progn
	      ;; We assume the line being continued is already
	      ;; properly indented...
	      ;; (setq prev-line-end (sh-prev-line))
	      (setq align-point (sh-prev-line nil))
	      (setq result (list '(+ sh-indent-for-continuation)))
	      (setq have-result t))
	  (beginning-of-line)
	  (skip-chars-forward " \t")
	  (setq this-kw (sh-get-kw)))

	  (setq result (append  (list (list t align-point)) result))
	)
      (sh-debug "result is now: %s" result)

      (or result
	  (if prev-line-end
	      (setq result (list (list t prev-line-end)))
	    (setq result (list (list '= 'sh-first-lines-indent)))
	    ))

      (if (eq result t)
	  (setq result nil))
      (sh-debug  "result is: %s" result)
      result

(defun sh-mark-init (buffer)
  "Initialize a BUFFER to be used by `sh-mark-line'."
  (save-excursion
    (set-buffer (get-buffer-create buffer))
    (erase-buffer)
    (occur-mode)
    ))


(defun sh-mark-line (message point buffer &optional add-linenum occur-point)
  "Insert MESSAGE referring to location POINT in current buffer into BUFFER.
Buffer BUFFER is in `occur-mode'.

		  (sh-set-var-value var val)))))
	(dolist (learned-var (reverse learned-var-list))
	  (let ((var (car learned-var)))
	    (sh-mark-line (format "  %s %s" var (symbol-value var))
			  (nth 2 learned-var) out-buffer)))
	(save-excursion
	  (set-buffer out-buffer)
	  (goto-char (point-min))
	  (insert
	   (format "Indentation values for buffer %s.\n" name)
	   (format "%d indentation variable%s different values%s\n\n"
		   num-diffs

CODE can be nil, t or `lambda'.
nil means to return the best completion of STRING, or nil if there is none.
t means to return a list of all possible completions of STRING.
`lambda' means to return t if STRING is a valid completion as it stands."
  (let ((sh-shell-variables
	 (save-excursion
	   (set-buffer sh-add-buffer)
	   (or sh-shell-variables-initialized
	       (sh-shell-initialize-variables))
	   (nconc (mapcar (lambda (var)
			    (let ((name
				   (substring var 0 (string-match "=" var))))

64266:a634aa374675

      (unless have-result
	;; Continuation lines are handled specially
	(if (sh-this-is-a-continuation)
	    (progn
              (setq result
                    (if (save-excursion
                          (beginning-of-line)
                          (not (memq (char-before (- (point) 2)) '(?\s ?\t))))
                        ;; By convention, if the continuation \ is not
                        ;; preceded by a SPC or a TAB it means that the line
                        ;; is cut at a place where spaces cannot be freely
                        ;; added/removed.  I.e. do not indent the line.
                        (list '(= nil))
                      ;; We assume the line being continued is already
                      ;; properly indented...
                      ;; (setq prev-line-end (sh-prev-line))
                      (setq align-point (sh-prev-line nil))
                      (list '(+ sh-indent-for-continuation))))
	      (setq have-result t))
	  (beginning-of-line)
	  (skip-chars-forward " \t")
	  (setq this-kw (sh-get-kw)))

	  (setq result (append  (list (list t align-point)) result))
	)
      (sh-debug "result is now: %s" result)

      (or result
	  (setq result (list (if prev-line-end
                                 (list t prev-line-end)
                               (list '= 'sh-first-lines-indent)))))

      (if (eq result t)
	  (setq result nil))
      (sh-debug  "result is: %s" result)
      result

(defun sh-mark-init (buffer)
  "Initialize a BUFFER to be used by `sh-mark-line'."
  (with-current-buffer (get-buffer-create buffer)
    (erase-buffer)
    (occur-mode)))


(defun sh-mark-line (message point buffer &optional add-linenum occur-point)
  "Insert MESSAGE referring to location POINT in current buffer into BUFFER.
Buffer BUFFER is in `occur-mode'.

		  (sh-set-var-value var val)))))
	(dolist (learned-var (reverse learned-var-list))
	  (let ((var (car learned-var)))
	    (sh-mark-line (format "  %s %s" var (symbol-value var))
			  (nth 2 learned-var) out-buffer)))
	(with-current-buffer out-buffer
	  (goto-char (point-min))
	  (insert
	   (format "Indentation values for buffer %s.\n" name)
	   (format "%d indentation variable%s different values%s\n\n"
		   num-diffs

CODE can be nil, t or `lambda'.
nil means to return the best completion of STRING, or nil if there is none.
t means to return a list of all possible completions of STRING.
`lambda' means to return t if STRING is a valid completion as it stands."
  (let ((sh-shell-variables
	 (with-current-buffer sh-add-buffer
	   (or sh-shell-variables-initialized
	       (sh-shell-initialize-variables))
	   (nconc (mapcar (lambda (var)
			    (let ((name
				   (substring var 0 (string-match "=" var))))