[Emacs-diffs] Changes to emacs/lisp/progmodes/sh-script.el

[Stefan Monnier]

Index: emacs/lisp/progmodes/sh-script.el
diff -c emacs/lisp/progmodes/sh-script.el:1.160 
emacs/lisp/progmodes/sh-script.el:1.161
*** emacs/lisp/progmodes/sh-script.el:1.160     Mon Jul  4 16:59:20 2005
--- emacs/lisp/progmodes/sh-script.el   Wed Jul 13 04:55:41 2005
***************
*** 2033,2043 ****
        ;; 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")
--- 2033,2052 ----
        ;; 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")
***************
*** 2130,2139 ****
        (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))
--- 2139,2147 ----
        (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))
***************
*** 2695,2705 ****
  
  (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)
--- 2703,2711 ----
  
  (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)
***************
*** 2972,2979 ****
          (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)
--- 2978,2984 ----
          (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)
***************
*** 3244,3251 ****
  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)
--- 3249,3255 ----
  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)