comparison lisp/progmodes/sh-script.el @ 51379:f61b3dac769b

(sh-is-quoted-p): New fun. (sh-font-lock-paren): Use it to allow \C in case patterns. (sh-get-indent-info): Check the \n before the line for string-status. (sh-feature): Remove unused var `function'. (sh-get-indent-info): Remove unused variables. (sh-prev-thing): Remove unused vars `going', `n', and `found'. (sh-set-indent): Remove unused var `new-val' and `val0'. (sh-learn-buffer-indent): Remove unused vars `last-pos' and `lines'. (sh-guess-basic-offset): Remove unused var `return' and `j'.

51378:140113b35d70

(defun sh-font-lock-here-doc (limit)
  "Search for a heredoc marker."
  ;; This looks silly, but it's because `sh-here-doc-re' keeps changing.
  (re-search-forward sh-here-doc-re limit t))

(defun sh-font-lock-paren (start)
  (save-excursion
    (goto-char start)
    ;; Skip through all patterns
    (while
	(progn
	  (forward-comment (- (point-max)))
	  ;; Skip through one pattern
	  (while
	      (or (/= 0 (skip-syntax-backward "w_"))
		  (/= 0 (skip-chars-backward "?*/"))
		  (when (memq (char-before) '(?\" ?\'))
		    (condition-case nil (progn (backward-sexp 1) t)
		      (error nil)))))
	  (forward-comment (- (point-max)))
	  (when (eq (char-before) ?|)

	(if (and (consp (setq val (cdr elt)))
		 (eq (car val) 'eval))
	    (setcdr elt
		    (setq val
			  (eval (if (consp (setq val (cdr val)))
				    (let ((sh-shell (car (cdr val)))
					  function)
				      (if (assq sh-shell list)
					  (setcar (cdr val)
						  (list 'quote
							(sh-feature list))))
				      val)

STRING	     This is ignored for the purposes of calculating
	     indentation, it is printed in certain cases to help show
	     what the indentation is based on."
  ;; See comments before `sh-kw'.
  (save-excursion
    (let ((prev-kw nil)
	  (prev-stmt nil)
	  (have-result nil)
	  depth-bol depth-eol
	  this-kw
	  (state nil)
	  state-bol
	  (depth-prev-bol nil)
	  start
	  func val
	  (result nil)
	  prev-lines-indent
	  (prev-list nil)
	  (this-list nil)
	  (align-point nil)
	  prev-line-end x)
      (beginning-of-line)
      ;; Note: setting result to t means we are done and will return nil.
      ;;(This function never returns just t.)
      (cond
       ((or (and (boundp 'font-lock-string-face)
		 (eq (get-text-property (point) 'face) font-lock-string-face))
	    (eq (get-text-property (point) 'face) sh-heredoc-face))
	(setq result t)
	(setq have-result t))
       ((looking-at "\\s-*#")		; was (equal this-kw "#")
	(if (bobp)

  ;;  nil  -  nothing
  ;; a string - possibly a keyword
  ;;
  (if (bolp)
      nil
    (let ((going t)
	  c n
	  min-point
	  (start (point))
	  (found nil))
      (save-restriction
	(narrow-to-region
	(if (sh-this-is-a-continuation)
	    (setq min-point (sh-prev-line nil))
	  (save-excursion

for a new value for it."
  (interactive)
  (sh-must-support-indent)
  (let* ((info (sh-get-indent-info))
	 (var (sh-get-indent-var-for-line info))
	 val val0 new-val old-val indent-val)
    (if (stringp var)
	(message (format "Cannot set indent - %s" var))
      (setq old-val (symbol-value var))
      (setq val (sh-read-variable var))
      (condition-case nil

  (save-excursion
    (goto-char (point-min))
    (let ((learned-var-list nil)
	  (out-buffer "*indent*")
	  (num-diffs 0)
	  last-pos
	  previous-set-info
	  (max 17)
	  vec
	  msg
	  (comment-col nil) ;; number if all same, t if seen diff values

      (setq learned-var-list
	    (append (list (list 'sh-indent-comment comment-col (point-max)))
		    learned-var-list))
      (setq sh-indent-comment comment-col)
      (let ((name (buffer-name))
	    (lines (if (and (eq (point-min) 1)
			    (eq (point-max) (1+ (buffer-size))))
		       ""
		     (format "lines %d to %d of "
			     (1+ (count-lines 1 (point-min)))
			     (1+ (count-lines 1 (point-max))))))
	    )
	(sh-mark-line  "\nLearned variable settings:" nil out-buffer)
	(if arg
	    ;; Set learned variables to symbolic rather than numeric
	    ;; values where possible.
	    (dolist (learned-var (reverse learned-var-list))

  list of numbers - no obvious one, here is a list of one or more
		    reasonable choices
  nil		  - we couldn't find a reasonable one."
  (let* ((max (1- (length vec)))
	 (i 1)
	 (totals (make-vector max 0))
	 (return nil)
	 j)
    (while (< i max)
      (aset totals i (+ (aref totals i) (* 4 (aref vec i))))
      (setq j (/ i 2))
      (if (zerop (% i 2))
	  (aset totals i (+ (aref totals i) (aref vec (/ i 2)))))
      (if (< (* i 2) max)
	  (aset totals i (+ (aref totals i) (aref vec (* i 2)))))
      (setq i (1+ i)))

51379:f61b3dac769b

(defun sh-font-lock-here-doc (limit)
  "Search for a heredoc marker."
  ;; This looks silly, but it's because `sh-here-doc-re' keeps changing.
  (re-search-forward sh-here-doc-re limit t))

(defun sh-is-quoted-p (pos)
  (and (eq (char-before pos) ?\\)
       (not (sh-is-quoted-p (1- pos)))))

(defun sh-font-lock-paren (start)
  (save-excursion
    (goto-char start)
    ;; Skip through all patterns
    (while
	(progn
	  (forward-comment (- (point-max)))
	  ;; Skip through one pattern
	  (while
	      (or (/= 0 (skip-syntax-backward "w_"))
		  (/= 0 (skip-chars-backward "?*/\\"))
		  (and (sh-is-quoted-p (1- (point)))
		       (goto-char (- (point) 2)))
		  (when (memq (char-before) '(?\" ?\'))
		    (condition-case nil (progn (backward-sexp 1) t)
		      (error nil)))))
	  (forward-comment (- (point-max)))
	  (when (eq (char-before) ?|)

	(if (and (consp (setq val (cdr elt)))
		 (eq (car val) 'eval))
	    (setcdr elt
		    (setq val
			  (eval (if (consp (setq val (cdr val)))
				    (let ((sh-shell (car (cdr val))))
				      (if (assq sh-shell list)
					  (setcar (cdr val)
						  (list 'quote
							(sh-feature list))))
				      val)

STRING	     This is ignored for the purposes of calculating
	     indentation, it is printed in certain cases to help show
	     what the indentation is based on."
  ;; See comments before `sh-kw'.
  (save-excursion
    (let ((have-result nil)
	  this-kw
	  start
	  val
	  (result nil)
	  (align-point nil)
	  prev-line-end x)
      (beginning-of-line)
      ;; Note: setting result to t means we are done and will return nil.
      ;;(This function never returns just t.)
      (cond
       ((or (and (boundp 'font-lock-string-face) (not (bobp))
		 (eq (get-text-property (1- (point)) 'face)
		     font-lock-string-face))
	    (eq (get-text-property (point) 'face) sh-heredoc-face))
	(setq result t)
	(setq have-result t))
       ((looking-at "\\s-*#")		; was (equal this-kw "#")
	(if (bobp)

  ;;  nil  -  nothing
  ;; a string - possibly a keyword
  ;;
  (if (bolp)
      nil
    (let (c min-point
	  (start (point)))
      (save-restriction
	(narrow-to-region
	(if (sh-this-is-a-continuation)
	    (setq min-point (sh-prev-line nil))
	  (save-excursion

for a new value for it."
  (interactive)
  (sh-must-support-indent)
  (let* ((info (sh-get-indent-info))
	 (var (sh-get-indent-var-for-line info))
	 val old-val indent-val)
    (if (stringp var)
	(message (format "Cannot set indent - %s" var))
      (setq old-val (symbol-value var))
      (setq val (sh-read-variable var))
      (condition-case nil

  (save-excursion
    (goto-char (point-min))
    (let ((learned-var-list nil)
	  (out-buffer "*indent*")
	  (num-diffs 0)
	  previous-set-info
	  (max 17)
	  vec
	  msg
	  (comment-col nil) ;; number if all same, t if seen diff values

      (setq learned-var-list
	    (append (list (list 'sh-indent-comment comment-col (point-max)))
		    learned-var-list))
      (setq sh-indent-comment comment-col)
      (let ((name (buffer-name)))
	(sh-mark-line  "\nLearned variable settings:" nil out-buffer)
	(if arg
	    ;; Set learned variables to symbolic rather than numeric
	    ;; values where possible.
	    (dolist (learned-var (reverse learned-var-list))

  list of numbers - no obvious one, here is a list of one or more
		    reasonable choices
  nil		  - we couldn't find a reasonable one."
  (let* ((max (1- (length vec)))
	 (i 1)
	 (totals (make-vector max 0)))
    (while (< i max)
      (aset totals i (+ (aref totals i) (* 4 (aref vec i))))
      (if (zerop (% i 2))
	  (aset totals i (+ (aref totals i) (aref vec (/ i 2)))))
      (if (< (* i 2) max)
	  (aset totals i (+ (aref totals i) (aref vec (* i 2)))))
      (setq i (1+ i)))